修改化验辅检匹配流程

tran-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -78,7 +78,7 @@ public class PacsConfigFacade extends PacsConfigServiceImpl{
      */
     public List<PacsConfigDTO> getPacsConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO) {
 
-        List<PacsConfigDTO> datas = getPacsConfigByCodeAndHosCode(lisPacsInfoForDJVO);
+        List<PacsConfigDTO> datas = getPacsConfigByCodesAndHosCode(lisPacsInfoForDJVO);
         return datas;
     }
 }

tran-service/src/main/java/com/diagbot/facade/TranLisConfigFacade.java

@@ -116,7 +116,7 @@ public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 	 */
 	public List<LisConfigDTO> getLisConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO) {
 
-		List<LisConfigDTO> datas = getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
+		List<LisConfigDTO> datas = getLisConfigByCodesAndHosCode(lisPacsInfoForDJVO);
 		return datas;
 	}
 }

tran-service/src/main/java/com/diagbot/mapper/PacsConfigMapper.java

@@ -19,5 +19,5 @@ public interface PacsConfigMapper extends BaseMapper<PacsConfig> {
 
     public List<PacsConfigDTO> getPacsConfigByNameAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 
-    public List<PacsConfigDTO> getPacsConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
+    public List<PacsConfigDTO> getPacsConfigByCodesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 }

tran-service/src/main/java/com/diagbot/mapper/TranLisConfigMapper.java

@@ -22,6 +22,6 @@ public interface TranLisConfigMapper extends BaseMapper<TranLisConfig> {
 
     List<LisConfigDTO> getLisConfigByNamesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 
-	List<LisConfigDTO> getLisConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
+	List<LisConfigDTO> getLisConfigByCodesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 
 }

tran-service/src/main/java/com/diagbot/service/PacsConfigService.java

@@ -19,5 +19,5 @@ public interface PacsConfigService extends IService<PacsConfig> {
 
     public List<PacsConfigDTO> getPacsConfigByNameAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 
-    public List<PacsConfigDTO> getPacsConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
+    public List<PacsConfigDTO> getPacsConfigByCodesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 }

tran-service/src/main/java/com/diagbot/service/TranLisConfigService.java

@@ -22,6 +22,6 @@ public interface TranLisConfigService extends IService<TranLisConfig> {
 
     public List<LisConfigDTO> getLisConfigByNamesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 
-	public List<LisConfigDTO> getLisConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
+	public List<LisConfigDTO> getLisConfigByCodesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 
 }

tran-service/src/main/java/com/diagbot/service/impl/PacsConfigServiceImpl.java

@@ -28,7 +28,7 @@ public class PacsConfigServiceImpl extends ServiceImpl<PacsConfigMapper, PacsCon
     }
 
     @Override
-    public List<PacsConfigDTO> getPacsConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO){
-        return baseMapper.getPacsConfigByCodeAndHosCode(lisPacsInfoForDJVO);
+    public List<PacsConfigDTO> getPacsConfigByCodesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO){
+        return baseMapper.getPacsConfigByCodesAndHosCode(lisPacsInfoForDJVO);
     }
 }

tran-service/src/main/java/com/diagbot/service/impl/TranLisConfigServiceImpl.java

@@ -34,8 +34,8 @@ public class TranLisConfigServiceImpl extends ServiceImpl<TranLisConfigMapper, T
     }
 
 	@Override
-	public List<LisConfigDTO> getLisConfigByCodeAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO){
-		return baseMapper.getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
+	public List<LisConfigDTO> getLisConfigByCodesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO){
+		return baseMapper.getLisConfigByCodesAndHosCode(lisPacsInfoForDJVO);
 	}
 
 }

tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -8,6 +8,7 @@ import com.diagbot.facade.*;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -327,25 +328,29 @@ public class InquiryInfoController {
 
         //化验套餐名转公表
         if (pushJoinVO.getLisOrderCode() != null && !"".equals(pushJoinVO.getLisOrderCode().trim())) {
-            orderCode = pushJoinVO.getLisOrderCode().split(".");
-            lisPacsInfoForDJVO.setOrderCode(orderCode[1]);
             lisPacsInfoForDJVO.setHosCode(pushJoinVO.getHosCode());
-            lisConfigDTO = tranLisConfigFacade.getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
-            if (lisConfigDTO.size() > 0) {
-                sb3.append("[");
-                for (int i = 0; i < lisConfigDTO.size(); i++) {
-                    sb3.append("{name: " + lisConfigDTO.get(i).getUniqueName() + ",type:12,position:1}");
-                }
-                sb3.append("]");
-            } else {
                 lisPacsInfoForDJVO.setOrderCode(pushJoinVO.getLisOrderCode());
                 lisConfigDTO1 = tranLisConfigFacade.getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
                 if (lisConfigDTO1.size() > 0) {
-                    sb3.append("[{name: " + lisConfigDTO1.get(0).getUniqueName() + ",type:12,position:1}]");
+                    if (lisConfigDTO1.get(0).getUniqueName().indexOf("、") != -1) {
+                        orderCode = lisConfigDTO1.get(0).getUniqueName().split("、");
+                        sb3.append("[");
+                        for (int i = 0; i < orderCode.length; i++) {
+                            if (i == orderCode.length - 1) {
+                                sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1}");
+                            } else {
+                                sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1},");
+                            }
+                        }
+                        sb3.append("]");
+                    }else{
+                        sb3.append("[{\"name\":\"" + lisConfigDTO1.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                    }
+
                 } else {
                     pacsConfigDTO = pacsConfigFacade.getPacsConfigByCodeAndHosCode(lisPacsInfoForDJVO);
                     if(pacsConfigDTO.size()>0){
-                        sb3.append("[{name: " + pacsConfigDTO.get(0).getUniqueName() + ",type:6,position:1}]");
+                        sb3.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
                     }
                 }
             }
@@ -354,7 +359,6 @@ public class InquiryInfoController {
             } else {
                 pushJoinVO.setLisOrder("");
             }*/
-        }
 
         //辅检套餐名转公表
         if (pushJoinVO.getPacsOrderCode() != null && !"".equals(pushJoinVO.getPacsOrderCode().trim())) {
@@ -362,11 +366,11 @@ public class InquiryInfoController {
             lisPacsInfoForDJVO.setHosCode(pushJoinVO.getHosCode());
             pacsConfigDTO = pacsConfigFacade.getPacsConfigByCodeAndHosCode(lisPacsInfoForDJVO);
             if (pacsConfigDTO != null && pacsConfigDTO.size() != 0) {
-                sb4.append("[{name: " + pacsConfigDTO.get(0).getUniqueName() + ",type:6,position:1}]");
+                sb4.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
             } else {
                 lisConfigDTO = tranLisConfigFacade.getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
                 if (lisConfigDTO.size() > 0) {
-                    sb4.append("[{name: " + lisConfigDTO.get(0).getUniqueName() + ",type:12,position:1}]");
+                    sb4.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
                 }
             }
         }
@@ -470,36 +474,47 @@ public class InquiryInfoController {
             //门诊 化验辅检静态知识
             case "9":
                 if (pushJoinVO.getLisOrderCode() != null && !"".equals(pushJoinVO.getLisOrderCode().trim())) {
-
-                    mrId = mrFacade.createMr(pushJoinVO);
-
-                    url = "http://192.1.3.116:5446/indexHorizontal.html?" +
-                            "mrId=" + mrId + //redis保存产生唯一值
-                            "&tipsInfoList=" + URLEncoder.encode(sb3.toString(), "utf-8") +  //多个提示信息内容
-                            "&showTab=1" +
-                            "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
-                            "&plan=9";
-
-                    inputInfo.setRemark("邵逸夫门诊化验静态知识接口");
-                    inputInfo.setParamOut(url);
-                    inputInfoFacade.saveInputInfo(inputInfo);
-                    return RespDTO.onSuc(url);
+                    if (!sb3.toString().equals("")) {
+                        mrId = mrFacade.createMr(pushJoinVO);
+                        url = "http://192.1.3.116:5446/indexHorizontal.html?" +
+                                "mrId=" + mrId + //redis保存产生唯一值
+                                "&tipsInfoList=" + URLEncoder.encode(sb3.toString(), "UTF-8") +  //多个提示信息内容
+                                "&showTab=1" +
+                                "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
+                                "&plan=9";
+
+                        inputInfo.setRemark("邵逸夫门诊化验静态知识接口");
+                        inputInfo.setParamOut(url);
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc(url);
+                    } else {
+                        inputInfo.setRemark("邵逸夫门诊化验静态知识接口");
+                        inputInfo.setParamOut("暂未维护该项目静态知识！");
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc("暂未维护该项目静态知识！");
+                    }
 
                 } else if (pushJoinVO.getPacsOrderCode() != null && !"".equals(pushJoinVO.getPacsOrderCode().trim())) {
+                    if (!sb4.toString().equals("")) {
+                        mrId = mrFacade.createMr(pushJoinVO);
+                        url = "http://192.1.3.116:5446/indexHorizontal.html?" +
+                                "mrId=" + mrId + //redis保存产生唯一值
+                                "&tipsInfoList=" + URLEncoder.encode(sb4.toString(), "UTF-8") +  //多个提示信息内容
+                                "&showTab=1" +
+                                "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
+                                "&plan=9";
+
+                        inputInfo.setRemark("邵逸夫门诊辅检静态知识接口");
+                        inputInfo.setParamOut(url);
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc(url);
+                    } else {
+                        inputInfo.setRemark("邵逸夫门诊辅检静态知识接口");
+                        inputInfo.setParamOut("暂未维护该项目静态知识！");
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc("暂未维护该项目静态知识！");
+                    }
 
-                    mrId = mrFacade.createMr(pushJoinVO);
-
-                    url = "http://192.1.3.116:5446/indexHorizontal.html?" +
-                            "mrId=" + mrId + //redis保存产生唯一值
-                            "&tipsInfoList=" + URLEncoder.encode(sb4.toString(), "utf-8") +  //多个提示信息内容
-                            "&showTab=1" +
-                            "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
-                            "&plan=9";
-
-                    inputInfo.setRemark("邵逸夫门诊辅检静态知识接口");
-                    inputInfo.setParamOut(url);
-                    inputInfoFacade.saveInputInfo(inputInfo);
-                    return RespDTO.onSuc(url);
                 }
                 return RespDTO.onError("未传入化验辅检套餐名称！");
 
@@ -599,38 +614,49 @@ public class InquiryInfoController {
             //住院 化验辅检静态知识
             case "6":
                 if (pushJoinVO.getLisOrder() != null && !"".equals(pushJoinVO.getLisOrder().trim())) {
-
-                    mrId = mrFacade.createMr(pushJoinVO);
-
-                    url = "http://192.1.3.116:5446/index.html?" +
-                            "mrId=" + mrId + //redis保存产生唯一值
-                            "&tipsName=" + pushJoinVO.getLisOrder() +  //静态信息名称（化验项名称、辅捡项名称）
-                            "&tipsType=12" +
-                            "&showTab=1" +
-                            "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
-                            "&plan=6";
-
-                    inputInfo.setRemark("邵逸夫化验静态知识接口");
-                    inputInfo.setParamOut(url);
-                    inputInfoFacade.saveInputInfo(inputInfo);
-                    return RespDTO.onSuc(url);
-
+                    if (!sb3.toString().equals("")) {
+                        mrId = mrFacade.createMr(pushJoinVO);
+
+                        url = "http://192.1.3.116:5446/index.html?" +
+                                "mrId=" + mrId + //redis保存产生唯一值
+                                "&tipsName=" + pushJoinVO.getLisOrder() +  //静态信息名称（化验项名称、辅捡项名称）
+                                "&tipsType=12" +
+                                "&showTab=1" +
+                                "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
+                                "&plan=6";
+
+                        inputInfo.setRemark("邵逸夫化验静态知识接口");
+                        inputInfo.setParamOut(url);
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc(url);
+                    }else{
+                        inputInfo.setRemark("邵逸夫化验静态知识接口");
+                        inputInfo.setParamOut("暂未维护该项目静态知识！");
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc("暂未维护该项目静态知识！");
+                    }
                 } else if (pushJoinVO.getPacsOrder() != null && !"".equals(pushJoinVO.getPacsOrder().trim())) {
-
-                    mrId = mrFacade.createMr(pushJoinVO);
-
-                    url = "http://192.1.3.116:5446/index.html?" +
-                            "mrId=" + mrId + //redis保存产生唯一值
-                            "&tipsName=" + pushJoinVO.getPacsOrder() +  //静态信息名称（化验项名称、辅捡项名称）
-                            "&tipsType=6" +
-                            "&showTab=1" +
-                            "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
-                            "&plan=6";
-
-                    inputInfo.setRemark("邵逸夫辅检静态知识接口");
-                    inputInfo.setParamOut(url);
-                    inputInfoFacade.saveInputInfo(inputInfo);
-                    return RespDTO.onSuc(url);
+                    if (!sb3.toString().equals("")) {
+                        mrId = mrFacade.createMr(pushJoinVO);
+
+                        url = "http://192.1.3.116:5446/index.html?" +
+                                "mrId=" + mrId + //redis保存产生唯一值
+                                "&tipsName=" + pushJoinVO.getPacsOrder() +  //静态信息名称（化验项名称、辅捡项名称）
+                                "&tipsType=6" +
+                                "&showTab=1" +
+                                "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
+                                "&plan=6";
+
+                        inputInfo.setRemark("邵逸夫辅检静态知识接口");
+                        inputInfo.setParamOut(url);
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc(url);
+                    }else{
+                        inputInfo.setRemark("邵逸夫辅检静态知识接口");
+                        inputInfo.setParamOut("暂未维护该项目静态知识！");
+                        inputInfoFacade.saveInputInfo(inputInfo);
+                        return RespDTO.onSuc("暂未维护该项目静态知识！");
+                    }
                 }
                 return RespDTO.onError("未传入化验辅检套餐名称！");
         }

tran-service/src/main/resources/mapper/PacsConfigMapper.xml

@@ -27,7 +27,7 @@
         </if>
     </select>
 
-    <select id="getPacsConfigByCodeAndHosCode" resultType="com.diagbot.dto.PacsConfigDTO">
+    <select id="getPacsConfigByCodesAndHosCode" resultType="com.diagbot.dto.PacsConfigDTO">
         SELECT *
         FROM tran_pacs_config a WHERE a.is_deleted = 'N'
         <if test="hosCode!=null">

tran-service/src/main/resources/mapper/TranLisConfigMapper.xml

@@ -47,7 +47,7 @@
         </if>
     </select>
 
-	<select id="getLisConfigByCodeAndHosCode" resultType="com.diagbot.dto.LisConfigDTO">
+	<select id="getLisConfigByCodesAndHosCode" resultType="com.diagbot.dto.LisConfigDTO">
 		SELECT *
 		FROM tran_lis_config a WHERE a.is_deleted = 'N'
 		<if test="hosCode!=null">