Merge branch 'dev/20200923_1.5.0' into test

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -280,7 +280,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     queryVo.setHospitalId(s.getHospitalId().toString());
                     queryVo.setCid(basHospitalInfoFacade.getHosCode(s.getHospitalId()));
 
-                    Long modeId = initModeId(s.getHospitalId(), s.getRecTitle());
+                    Long modeId = initModeId(s.getHospitalId(), s.getRecTypeId());
                     s.getContents().stream().forEach(item -> {
                         //拼接入参用于结构化解析
                         AColumnContentVO aColumnContentVO = new AColumnContentVO();
@@ -527,7 +527,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         Long modeId = Long.valueOf("0");
         QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
         wrapper.eq("hospital_id", medicalRecord.getHospitalId());
-        wrapper.eq("hospital_model_name", medicalRecord.getRecTitle());
+        //wrapper.eq("hospital_model_name", medicalRecord.getRecTitle());
+        wrapper.eq("remark", medicalRecord.getRecTypeId());
         ModelHospital mode = modelHospitalFacade.getOne(wrapper, false);
         if (mode != null) {
             modeId = mode.getStandModelId();
@@ -541,14 +542,15 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      * 初始化模型ID
      *
      * @param hospitalId
-     * @param recTitle
+     * @param recTypeId
      * @return
      */
-    private Long initModeId(Long hospitalId, String recTitle) {
+    private Long initModeId(Long hospitalId, String recTypeId) {
         Long modeId = Long.valueOf("0");
         QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
         wrapper.eq("hospital_id", hospitalId);
-        wrapper.eq("hospital_model_name", recTitle);
+        //wrapper.eq("hospital_model_name", recTitle);
+        wrapper.eq("remark", recTypeId);
         ModelHospital mode = modelHospitalFacade.getOne(wrapper, false);
         if (mode != null) {
             modeId = mode.getStandModelId();