Просмотр исходного кода

新增规格字段,还有ca签名正式环境变量

xiaochan 1 месяц назад
Родитель
Сommit
083e6fd55e

+ 1 - 1
pom.xml

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

+ 1 - 1
src/main/java/thyyxxk/webserver/config/envionment/CaData.java

@@ -35,7 +35,7 @@ public class CaData {
         /**
          * 证书
          */
-        private String cert;
+        private String containerName;
 
         /**
          * 签名算法

+ 3 - 4
src/main/java/thyyxxk/webserver/dao/his/inpatient/xmlr/XiangMuLuRuDao.java

@@ -876,15 +876,14 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       name as chargeName,\n" +
             "       bill_item_name=(select name\n" +
             "                       from zy_bill_item\n" +
-            "                       where code = charge_item.bill_item_zy),ori_detail_sn,gen_time,charge_item.serial " +
+            "                       where code = charge_item.bill_item_zy),ori_detail_sn,gen_time,charge_item.serial,descriptions " +
             "from zy_detail_charge a\n" +
-            "         left join (select code, '00' as serial, name, 'xm' as flag, bill_item_zy\n" +
+            "         left join (select code, '00' as serial, name, 'xm' as flag, bill_item_zy,descriptions\n" +
             "                    from zd_charge_item\n" +
             "                    union\n" +
-            "                    select code, serial, name, 'yp' as flag, bill_item_zy\n" +
+            "                    select code, serial, name, 'yp' as flag, bill_item_zy,specification\n" +
             "                    from yp_zd_dict) charge_item\n" +
             "                   on (charge_code_mx = code and isnull(nullif(rtrim(a.serial), ''), '00') = charge_item.serial)" +
             "${ew.customSqlSegment}")
     List<FeeResult.Detail> getFee(@Param("ew") QueryWrapper<?> qw);
-
 }

+ 10 - 4
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -88,12 +88,15 @@ public interface JianYanJianChaDao {
             "                                                       where c.zy_order_code = order_code)\n" +
             "                             else '00' end                                                               classes\n" +
             "from ysh_yj_req with (NOLOCK)\n" +
-            "where req_no = #{reqNo}")
-    YshYjReq huoQuShengQingXiangQing(@Param("reqNo") Integer reqNo);
+            "${ew.customSqlSegment}")
+    List<YshYjReq> huoQuShengQingXiangQing(@Param("ew") QueryWrapper<YshYjReq> reqNo);
 
-    @Select("select sex, " +
+    @Select("select top 1 sex, " +
             "       home_street," +
-            "       home_tel " +
+            "       home_tel," +
+            "       responceTypeName = (select responce_type_name = (select rtrim(name) from zy_zd_responce_type where code = responce_type) \n" +
+            "from zy_actpatient with (NOLOCK) \n" +
+            "where inpatient_no = #{patNo}) " +
             "from a_patient_mi with (NOLOCK) " +
             "where inpatient_no = #{patNo}")
     PatientTemp huoQuHuanZheXinXi(@Param("patNo") String patNo);
@@ -579,4 +582,7 @@ public interface JianYanJianChaDao {
             "         left join ${tableName} e with (NOLOCK) on (a.order_code = e.zy_order_code) " +
             " and  ${ew.sqlSegment};")
     List<JyJcCheckItemDto> selectJyJcCheckItemDto(@Param("ew") QueryWrapper<?> queryWrapper, @Param("tableName") String tableName);
+
+
+
 }

+ 1 - 0
src/main/java/thyyxxk/webserver/entity/xmlr/vo/FeeResult.java

@@ -30,5 +30,6 @@ public class FeeResult {
         private Integer oriDetailSn;
         private Date genTime;
         private String serial;
+        private String descriptions;
     }
 }

+ 29 - 3
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingService.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.service.zhuyuanyisheng;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -83,11 +84,13 @@ public class JianYanJianChaShenQingService {
     }
 
     public ResultVo<Map<String, Object>> huoQuShengQingXiangQing(Integer reqNo) {
-        YshYjReq req = dao.huoQuShengQingXiangQing(reqNo);
-        if (req == null) {
+        List<YshYjReq> reqList = dao.huoQuShengQingXiangQing(new QueryWrapper<YshYjReq>().eq("req_no", reqNo));
+        if (ListUtil.isBlank(reqList)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_HTML_ERROR, "没有查询到有效信息,可能已经被删除了。");
         }
 
+        YshYjReq req = reqList.get(0);
+
         Map<String, Object> map = new HashMap<>();
         StringBuilder zhuYiShiXiang = new StringBuilder();
 
@@ -116,10 +119,22 @@ public class JianYanJianChaShenQingService {
         //联系电话
         req.setHomeTel(patient.getHomeTel());
         // 医保身份
-        req.setResponceTypeName(dao.huoQuHuanZheShenFen(req.getInpatientNo()));
 
         map.put("title", jc.getComm());
 
+        Map<String, Field> fieldMap = ReflectUtil.getFieldMap(JcZdClass.class);
+        for (Map.Entry<String, Field> item : fieldMap.entrySet()) {
+            String name = item.getKey();
+            if (name.startsWith("comment")) {
+                String value = ReflectUtil.invoke(jc, StringUtil.getMethodName(name));
+                if (StringUtil.notBlank(value)) {
+                    log.info("value:{}", value);
+                }
+
+            }
+        }
+
+
         Field[] fields = jc.getClass().getDeclaredFields();
         for (Field field : fields) {
             field.setAccessible(true);
@@ -139,6 +154,17 @@ public class JianYanJianChaShenQingService {
         return ResultVoUtil.success(map);
     }
 
+    private ResultVo<Object> printListReqNo(List<Integer> reqNo) {
+        List<YshYjReq> reqList = dao.huoQuShengQingXiangQing(new QueryWrapper<YshYjReq>().eq("req_no", reqNo));
+        if (ListUtil.isBlank(reqList)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到有效信息,可能已经被删除了。");
+        }
+        YshYjReq req = reqList.get(0);
+        PatientTemp patient = dao.huoQuHuanZheXinXi(req.getInpatientNo());
+
+        return null;
+    }
+
     public ResultVo<List<JcZdClass>> getTemplateGrouping(Integer itemType, Integer templateType) {
         QueryWrapper<?> qw = templateQueryWrapper(itemType, templateType);
         return ResultVoUtil.success(dao.getTemplate(qw));

+ 21 - 1
src/main/resources/application-prod.yml

@@ -144,6 +144,26 @@ thmz-api-url: http://172.16.32.160:81/thmz
 rmHkUserApi: http://172.16.32.167:20923/thyy/api/haikang/door/destructionUser
 
 thyy:
+  ca:
+    timestamp-authentication:
+      url: http://172.16.32.135/services/TimeStampServices
+      app-code: ywxt
+      app-pwd: 12345678
+    sign-authentication:
+      app-code: ywxt
+      app-pwd: 12345678
+      sign-aig: "SM3withSM2"
+      url: http://172.16.32.135/services/CipherServices
+      container-name: "Cont1"
+    mobile-app:
+      app-id: 1
+      url: http://172.16.32.135:8080/openapi
+      privatekey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCCuwgon3RCGr3PZD7yH+1SC1i9PzochRma3ZTO6OPkbuH9ng0ePu6tvSSgVKkKg8Z9xgGVAFbH9KIJGK/xrgEMfTBVd3K4vyE8amymT9MPF2HsjR3ghZnFqIhNeF3MzrpxtduC8J8CMM3eSC7i4XGYVTvl+w2ACFMkAYz+IbdIIICSqZOvJ9xISIBpVMilpnYrLq0G9M2ov6voagGavMp+/dxXztRYlRDKKfOXhmHoFmatk6xMzuHiUs1/drb6n5LmT4uj+aL4JQhAzfBbU4sPbwy+lpWiM4VL/QVvE1k2KpfDeobDFon7Iyr8tnsTuTs1THaKoIBu2UVCao9EC/sNAgMBAAECggEATkMt1TPwY4qiyz+WN1lJt+43B8SMQ3qjI4U3is79b0m6XRx7efnu5W/wN1O3hyXwdGdPlyYGzdn0D0IKQsMKubFQeDn0Igm6GfMUbFQpZEV5SCYLFtikgCIux0Ih1XSFRYG7kh3+807IUCQifYy9dpbALyQmptlU/J85CwKgOLrp8l6CgJ87jLWpjNW4hRybNQRRxD3YnUiZ0O/dPpKmGSz1CZKzFmAfph8GD/WEXrIzL86A9eQN5sf9lFFlJ1Umzu2cgpNjylq8Zqi9wDOrqdxznPylJST8zZCv0kWy3K3YuORW4Z4GzR1kN3Xy50vOfl75T6Gw9rXXesqh0jaCgQKBgQDtgqV7Lk6+cXtLbymehK8c4jfCRQAxRNdBvURurwDnP86d/YpANtWyOJId+Q4AXUF3wtYdFUFdTsje4rajaQVMOozVSX2oaG+597QqUuvKlK8TEMB9MTzkVvUf15tkPihdCyii13A/3Qz0bJ2mcMf+ZJPLNBALnu5jN0rp3oHQnQKBgQCM6F4OWyy9PnmljjYkzIn9DP2AinGY6V/XHLc1rSkLtzlHDa4BKCJToZ0vB9MqxT1LTBTsbg4+VhZmHw9vtZr3fyPmDLUfNQi3Q0/m4udUIRH4ptpZUE/JOb3vGUrL/VdsTgjWos/nJxOvkbAg+74H9khPygKgRAfC3PPLXckxMQKBgQDWobGZV4ehYjvhN1uM/Kqil2t8C47Y9zTvG3Kz80IFuAunim9dCDClFao1m9OjUKLQ7yk+ru6au4+am5Ygpc87y81pETiU74vHqqkNdlHOh/6OZB0PBWfZkRuC4vxx4hnnuyXFwpqVm9URLPZqapDQu2MzxqCZX85dqqHwJjt5oQKBgFbRGJppzJ/w7Ux22Z9EssRKC6r2IdWf/J/yHmOhBAgm5NCFei9WRggXLFx8yruwePp6ru2ZRYdczUIwYvdmAkv5dunX7ISEzZD0lTdhmDv6gDMewquC0xXdUMwPXklfF00wqztrZwM5zWRANC+uS8BmGtmmUoXiRJHoRwGHEF4RAoGBALfswY8UTXR5AzY7+q4MhMdJjDe9mseK6HjrE2m3ClZ21nxLtLRA4y6hD7NXWKrrwliriz+DFiv1TQ2uLWTUH0TErOzCDxtOdxslFeva44dTzdVMUjj3OQ1KwDBdiZy107eYDnSPvDNjzNGKp6cT4YvO4WLK+MbqkiIoFbzGnZJO
+    HBoard-sign:
+      api-key: ywxt
+      api-secret: 12345678
+      url: http://172.16.32.135:8082
+      return-url: http://172.16.30.66:8706/casign/hBoardSignReturnUrl
   system:
     yz-config:
       yz-allow-invalidation: true
@@ -186,4 +206,4 @@ thyy:
     hosp-area: 430105
     hosp-level: 03
     soft-developer:
-    api-name:
+    api-name: