Merge branch 'master' of https://172.16.32.165/lighter/web-server

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>1</version>
+    <version>2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/dao/his/yibao/DictionaryDao.java

@@ -16,7 +16,7 @@ public interface DictionaryDao {
             "isnull(del_flag,0)!=1 and ${method} LIKE #{content} collate Chinese_PRC_CI_AS")
     List<PureCodeName> searchPhysician(@Param("method") String method, @Param("content") String content);
 
-    @Select("select rtrim(yb_code) as code, rtrim(yb_name) as name from zd_icd_code_new " +
+    @Select("select diagnosis_code as code,diagnosis_name as name from t_si_dl_dss_dns " +
             "where ${method} LIKE #{content} collate Chinese_PRC_CI_AS order by weight desc")
     List<PureCodeName> searchDiagnose(@Param("method") String method, @Param("content") String content);
 

src/main/java/thyyxxk/webserver/entity/medicalinsurance/manage/detailanalyse/FsiHisDataDto.java

@@ -0,0 +1,14 @@
+package thyyxxk.webserver.entity.medicalinsurance.manage.detailanalyse;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import thyyxxk.webserver.utils.SiUtil;
+
+@Data
+public class FsiHisDataDto {
+    @JSONField(name = "fixmedins_code")
+    private String fixmedinsCode = SiUtil.INSTITUTION_ID;
+
+    @JSONField(name = "fixmedins_name")
+    private String fixmedinsName = SiUtil.INSTITUTION_NAME;
+}

src/main/java/thyyxxk/webserver/entity/medicalinsurance/manage/detailanalyse/MainPart.java

@@ -19,4 +19,7 @@ public class MainPart {
 
     @JSONField(name = "trig_scen")
     private String trigScen;
+
+    @JSONField(name = "fsi_his_data_dto")
+    private FsiHisDataDto fsiHisDataDto;
 }

src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetService.java

@@ -266,7 +266,9 @@ public class CaseFrontSheetService {
         if (0 == days) {
             days = 1;
         }
-        sheet.setAdmissDays(String.valueOf(days));
+        if (days > 0) {
+            sheet.setAdmissDays(String.valueOf(days));
+        }
 
         if (null == sheet.getQualityControlDate()) {
             sheet.setQualityControlDate(new Date());

src/main/java/thyyxxk/webserver/service/dictionary/NationalMatchService.java

@@ -122,6 +122,10 @@ public class NationalMatchService {
             dao.matchMedicineAndHerbal(param.getCode(), staffId, param.getNationalCode(), param.getNationalName());
         } else {
             ChargeItemMatch chargeItemMatch = dao.selectServiceAbout(param.getNationalCode());
+            if (null == chargeItemMatch) {
+                chargeItemMatch = new ChargeItemMatch();
+                chargeItemMatch.setNationalCode(param.getNationalCode());
+            }
             chargeItemMatch.setHisCode(param.getCode());
             chargeItemMatch.setStaffId(staffId);
             chargeItemMatch.setNationalName(param.getNationalName());

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiManageService.java

@@ -378,7 +378,10 @@ public class SiManageService {
         fsiEncounterDtos.setFsiOrderDtos(fsiOrderDtos);
 
         patientDtos.setFsiEncounterDtos(fsiEncounterDtos);
+        FsiHisDataDto fsiHisDataDto = new FsiHisDataDto();
+
         mainPart.setPatientDtos(patientDtos);
+        mainPart.setFsiHisDataDto(fsiHisDataDto);
 
         String ref = JSONObject.toJSONStringWithDateFormat(mainPart, "yyyy-MM-dd HH:mm:ss");
         input.getJSONObject("input").put("data", JSONObject.parseObject(ref));

src/main/java/thyyxxk/webserver/service/yibao/DictionaryService.java

@@ -60,11 +60,11 @@ public class DictionaryService {
     private List<PureCodeName> deepinDiag(String method, String content, boolean accurateSearch) {
         content = accurateSearch ? content + '%' : '%' + content + '%';
         if (method.equals("alpha")) {
-            method = "yb_py_code";
+            method = "py_code";
         } else if (method.equals("code")) {
-            method = "yb_code";
+            method = "diagnosis_code";
         } else {
-            method = "yb_name";
+            method = "diagnosis_name";
         }
         return dao.searchDiagnose(method, content);
     }