1/25 优化1.3

src/main/java/com/glxp/mipsdl/client/lhzyy/LhzyyClient.java

@@ -41,6 +41,7 @@ import com.glxp.mipsdl.req.ctqyy.CtqyyRequest;
 import com.glxp.mipsdl.req.dsxyy.DsOrderRequest;
 import com.glxp.mipsdl.req.lhzyy.LhProductRequest;
 import com.glxp.mipsdl.req.lhzyy.LhUnitRequest;
+import com.glxp.mipsdl.req.lhzyy.LhzyyRequest;
 import com.glxp.mipsdl.req.post.*;
 import com.glxp.mipsdl.req.yxzyy.YxBusTypeRequest;
 import com.glxp.mipsdl.req.yxzyy.YxProductRequest;
@@ -56,6 +57,9 @@ import com.glxp.mipsdl.util.DictUtl;
 import com.glxp.mipsdl.util.ResultVOUtils;
 import com.glxp.mipsdl.util.SubmitOrderUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -80,6 +84,21 @@ public class LhzyyClient extends CommonHttpClient {
                 "</root>";
     }
 
+    public String parserResult(String response) {
+        if (response.contains("<root")) {
+            try {
+                Document document = DocumentHelper.parseText(response);
+                String message = document.getRootElement().element("message").getText();
+                return message;
+            } catch (DocumentException e) {
+                log.info("解析龙海中医院接口返回结果异常, 返回结果：{}", response);
+                log.error("异常信息：", e);
+            }
+        }
+        return response;
+    }
+
+
     @Resource
     private ThrSystemDetailService thrSystemDetailService;
     @Resource
@@ -412,13 +431,13 @@ public class LhzyyClient extends CommonHttpClient {
         materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8());
         //暂无收费标志
         materialDictEntity.setFeeFlag(udiRelevanceResponse.getBasicPrductRemak6());
-        CtqyyRequest ctqyyRequest = new CtqyyRequest();
-        ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict"));
-        ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity));
-        String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest);
-//        response = parserResult(response);
+        LhzyyRequest lhzyyRequest = new LhzyyRequest();
+        lhzyyRequest.setMsgHeader(getMsgHeader("addMaterialDict"));
+        lhzyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity));
+        String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), lhzyyRequest);
+        response = parserResult(response);
         try {
-            log.error("提交新增产品信息：" + ctqyyRequest.getMsgBody());
+            log.error("提交新增产品信息：" + lhzyyRequest.getMsgBody());
             CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class);
             if (baseResponse.getCode() != 20000) {
                 String errMsg = "提交新增产品信息，异常：{}" + response;

src/main/java/com/glxp/mipsdl/entity/lhsyy/MaterialDictEntity.java

@@ -2,12 +2,18 @@ package com.glxp.mipsdl.entity.lhsyy;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class MaterialDictEntity {
 
     private String materialCode;
 
 
+    /**
+     * 材料类别
+     */
+    private Integer dlid;
     /**
      * 材料分类ID
      */
@@ -23,7 +29,78 @@ public class MaterialDictEntity {
      */
     private String ypspm;
 
+    private Integer cd;
+
+    /**
+     * 规格
+     */
+    private String gg;
+
+    /**
+     * 型号
+     */
+    private String xh;
+
+
+    /**
+     * 剂量单位(小单位)
+     */
+    private Integer dw1;
+
+
+    /**
+     * 换算关系
+     */
+    private BigDecimal hsgx;
+
+    /**
+     * 医保编码
+     */
+    private String ybbm;
+
+    /**
+     * 零售价
+     */
+    private BigDecimal lsj;
+
+
+    /**
+     * 注册文号
+     */
+    private String pzwh;
+
+    /**
+     * 换算关系
+     */
+    private BigDecimal ghdw;
+
+
+    /**
+     * 病案名称ID
+     */
+    private String healthcode;
+
+    /**
+     * 医保结算（0:N，1:Y）
+     */
+    private String ybjsqr;
+
+    /**
+     * 是否组合套（0:否，1:是）
+     */
+    private Integer sfzht;
+
+    /**
+     * 国家医保编码
+     */
+    private String gjhcbm;
+
+
+    /**
+     * 是否医保范围（0:否，1:是）
+     */
+    private Integer sfybfw;
+
 
-//    cd  gg  xh dw dw1 hsgx ybbm  pfj  lsj  pzwh ghdw  healthcode  ybjsqr sfzht gjhcbm sfybfw
 
 }

src/main/java/com/glxp/mipsdl/req/lhzyy/LhzyyRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.mipsdl.req.lhzyy;
+
+import lombok.Data;
+
+@Data
+public class LhzyyRequest {
+
+    /**
+     * 请求头参数
+     */
+    private String msgHeader;
+
+    /**
+     * 请求体
+     */
+    private String msgBody;
+
+}