lighter 4 anni fa
parent
commit
8b0523a36a

+ 33 - 0
src/main/java/thyyxxk/webserver/controller/medicalinsurance/ZyMedInsController.java

@@ -0,0 +1,33 @@
+package thyyxxk.webserver.controller.medicalinsurance;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import thyyxxk.webserver.config.auth.PassToken;
+import thyyxxk.webserver.service.medicalinsurance.MedInsSignService;
+import thyyxxk.webserver.service.medicalinsurance.ZyMedInsService;
+
+/**
+ * @description: 住院医保入口
+ * @author: DingJie
+ * @create: 2021-06-08 16:18:53
+ **/
+@RestController
+@RequestMapping("/zyMedIns")
+public class ZyMedInsController {
+    private final ZyMedInsService service;
+    private final MedInsSignService signService;
+
+    @Autowired
+    public ZyMedInsController(ZyMedInsService service, MedInsSignService signService) {
+        this.service = service;
+        this.signService = signService;
+    }
+
+    @PassToken
+    @GetMapping("/signIn")
+    public void oracleTest() {
+        signService.signIn();
+    }
+}

+ 1 - 0
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/MedicalInsuranceDao.java

@@ -32,4 +32,5 @@ public interface MedicalInsuranceDao {
     @Select("select *,operName=(select rtrim(name) from a_employee_mi where code=oper_id) " +
             "from zy_in_diag_yb where inpatient_no=#{zyh} and admiss_times=#{times}")
     List<ZyInYbDiag> selectZyInYbDiags(@Param("zyh") String zyh, @Param("times") int times);
+
 }

+ 99 - 0
src/main/java/thyyxxk/webserver/entity/medicalinsurance/MedicalCentralSupplies.java

@@ -0,0 +1,99 @@
+package thyyxxk.webserver.entity.medicalinsurance;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author dj
+ */
+@Data
+public class MedicalCentralSupplies implements Serializable {
+
+	private static final long serialVersionUID =  8347083420294557259L;
+
+	/**
+	 * goodsId
+	 */
+	private String goodsId;
+
+	/**
+	 * 医保耗材代码
+	 */
+	private String medListCode;
+
+	/**
+	 * ggxhCode
+	 */
+	private String ggxhCode;
+
+	/**
+	 * 一级分类
+	 */
+	private String mcsType1;
+
+	/**
+	 * 二级分类
+	 */
+	private String mcsType2;
+
+	/**
+	 * 三级分类
+	 */
+	private String mcsType3;
+
+	/**
+	 * 医保通用名
+	 */
+	private String hiGenname;
+
+	/**
+	 * 耗材材质
+	 */
+	private String mcsMatl;
+
+	/**
+	 * 特征
+	 */
+	private String spec;
+
+	/**
+	 * 注册备案号
+	 */
+	private String regFilNo;
+
+	/**
+	 * 单件产品名称
+	 */
+	private String productName;
+
+	/**
+	 * 耗材企业名称
+	 */
+	private String prodentpName;
+
+	/**
+	 * 规格
+	 */
+	private String specGg;
+
+	/**
+	 * 型号
+	 */
+	private String mol;
+
+	/**
+	 * 计量单位
+	 */
+	private String productUnit;
+
+	/**
+	 * udi
+	 */
+	private String udi;
+
+	/**
+	 * 类型
+	 */
+	private String type;
+
+}

+ 6 - 3
src/main/java/thyyxxk/webserver/service/medicalinsurance/MedInsSignService.java

@@ -50,8 +50,11 @@ public class MedInsSignService {
         signIn.put("ip", IP_ADDR);
         header.getJSONObject("input").put("signIn", signIn);
         RestTemplate template = new RestTemplate();
+
+        log.info("医保签到地址:{}", siApiUrl);
+        log.info("医保签到参数:{}", header);
         JSONObject result = template.postForObject(siApiUrl, header, JSONObject.class);
-        log.info("医保签到:{}", result);
+        log.info("医保签到结果:{}", result);
         if (null != result && result.getIntValue(RESULT_CODE) == 0) {
             JSONObject output = result.getJSONObject(OUTPUT);
             signNo = output.getString("sign_no");
@@ -99,8 +102,8 @@ public class MedInsSignService {
         header.put("msgid", SiMsgIdUtil.makeMsgId());
         header.put("mdtrtarea_admvs", "430105");
         header.put("insuplc_admdvs", "");
-        // TODO: 2021-05-28 替换下方值
-        header.put("recer_sys_code", "接收方系统代码,用于多套系统接入,区分不同系统使用");
+        // TODO: 2021-05-28 替换下方值(接收方系统代码,用于多套系统接入,区分不同系统使用)
+        header.put("recer_sys_code", "430105");
         header.put("dev_no", "");
         header.put("dev_safe_info", "");
         header.put("cainfo", "");

+ 1 - 0
src/main/java/thyyxxk/webserver/service/medicalinsurance/MzMedInsService.java

@@ -27,4 +27,5 @@ public class MzMedInsService {
         this.dao = dao;
         this.signService = signService;
     }
+
 }

+ 11 - 0
src/main/java/thyyxxk/webserver/service/medicalinsurance/ZyMedInsService.java

@@ -21,6 +21,17 @@ import java.util.List;
  * @description: 住院医保交易
  * @author: DingJie
  * @create: 2021-05-14 16:28:16
+ *
+ * 联通云:
+ * http://10.136.68.156:20005/isp-api/powercsb/1101
+ * api_access_key=FqSRO1tkKe4PTsZS8mJkN3zs12U6Zkkwez6Qhy
+ * api_secreKey=SKklCVOoGDag5ys4zkSE2qHYo8iU4FsG7DNyJQYI
+ *
+ * 省政府二院:
+ * http://10.90.0.11:8081/isp-api/powercsb/1101
+ * api_access_key=sJAXxQd10aQLWZFAMH3PT9pHCGGqXPzz4Hv4Ei
+ * api_secreKey=SK1BtAloxIaQUgv9m0gjqrQJ0NJikkPPUTlRGOzp
+ *
  **/
 @Slf4j
 @Service

+ 1 - 1
src/main/resources/application-dev.yml

@@ -63,6 +63,6 @@ CSSYB_MT_PRE_CAL:
 PROOFREAD:
   http://172.16.30.26:1111/proofread/start
 
-si-api-url: https://www.baidu.com
+si-api-url: http://10.90.0.11:8081/isp/powercsb/1101
 hrg-api-url: http://172.16.30.33:8089/thmz/api/v1
 powersi-api-url: http://172.16.32.183:8916/mmg-gateway

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

@@ -66,6 +66,6 @@ CSSYB_MT_PRE_CAL:
 PROOFREAD:
   http://172.16.32.163:1111/proofread/start
 
-si-api-url: https://www.baidu.com
+si-api-url: http://10.90.0.11:8081/isp/powercsb/1101
 hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
 powersi-api-url: http://172.16.32.183:8916/mmg-gateway

+ 1 - 6
src/main/resources/application.yml

@@ -29,11 +29,6 @@ spring:
           password:
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    #        cz:
-    #          url: "jdbc:postgresql://172.16.32.185:5432/bdp_db"
-    #          username: "bdp"
-    #          password: "Powersi$123"
-    #          driver-class-name: "org.postgresql.Driver"
     hikari:
       minimum-idle: 10
       idle-timeout: 180000
@@ -77,6 +72,6 @@ CSSYB_MT_PRE_CAL:
 PROOFREAD:
   http://172.16.30.26:1111/proofread/start
 
-si-api-url: https://www.baidu.com
+si-api-url: http://10.90.0.11:8081/isp/powercsb/1101
 hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
 powersi-api-url: http://172.16.32.183:8916/mmg-gateway