From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java |  120 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
index 9a53c5a..d7975e6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -2,19 +2,20 @@
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.hosp.domain.TjCustomer;
 import com.ltkj.hosp.hisDto.*;
 import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.system.service.ISysConfigService;
 import com.ltkj.web.wxUtils.HttpClientUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,19 +25,21 @@
 /* @Authot:zjh
  * @Date:  2024-05-28
  * */
-
+@Slf4j
 @Component
 public class HisApiMethodService {
     @Autowired
     private ITjCustomerService tjCustomerService;
+    @Autowired
+    private ISysConfigService configService;
 
     private static  String HIS_URL = "";
 
-    // 鏁版嵁搴撻厤缃枃浠惰矾寰�
-//    private static final String CONFIG_PATH = "/Users/chacca/寮�鍙戠浉鍏�/浠g爜/ltkj_peis/ltkj-admin/src/main/resources/config.properties";
-    private static final String CONFIG_PATH = "D:\\ltkjprojectconf\\config.properties";
+    private static String CONFIG_PATH;
 
-    static  {
+    @Value ("${config.properties}")
+    public void setConfigPath(String configPath) {
+        CONFIG_PATH = configPath;
         try {
             FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
             Properties props = new Properties();
@@ -49,9 +52,23 @@
         }
     }
 
+/*    static  {
+        try {
+            FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
+            Properties props = new Properties();
+            props.load(inputStream);
+            String url = props.getProperty("his_api_url");
+            String port = props.getProperty("his_api_port");
+            HIS_URL=url+":"+port+"/api/His/";
+        } catch (IOException throwables) {
+            throwables.printStackTrace();
+        }
+    }*/
+
 
     //    @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
     public AjaxResult Outpincreateapply (TjCustomer customer) {
+        String ysbm = configService.selectConfigByKey("request_default_ysbm");
         Map<String, Object> map = new HashMap<> ();
         if (null != customer.getPationId () && !customer.getPationId().equals("0")) {
             map.put ("Pationid", customer.getPationId ());
@@ -59,11 +76,18 @@
             map.put ("Pationid", null);
         }
         map.put ("brxm", customer.getCusName ());
-        map.put ("brxb", customer.getCusSex ());
+        Long cusSex = customer.getCusSex();
+        if(cusSex==0L){
+            map.put ("brxb",1);
+        }else if(cusSex==1L){
+            map.put ("brxb",2);
+        }else {
+            map.put ("brxb",9);
+        }
         map.put ("csrq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
         map.put ("brnl", customer.getAge ());
         map.put ("brnldw", customer.getAgeUnit ());
-        map.put ("addr", customer.getAddr ());
+        map.put ("addr", customer.getCusAddr());
         map.put ("gzdw", null);
         map.put ("dwdz", null);
         map.put ("lxr", customer.getCusName ());
@@ -75,7 +99,7 @@
         map.put ("mz", null);
         map.put ("zy","鑱屽憳");
         map.put ("fbbm", null);
-        map.put ("czy", "00029");
+        map.put ("czy", ysbm);
         map.put ("jkkkh",null);
         map.put ("mindex_id",null);
 //        map.put ("zybm","鑱屽憳");
@@ -115,34 +139,30 @@
 
     //    @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖璇婃柇")
     public AjaxResult Outpinimpapply (OutpinimpapplyDto dto) {
-        Map<String, Object> map = new HashMap<> ();
-        map.put ("his_registration_id", dto.getHisRegistrationId ());
-        map.put ("mzzdid", dto.getMzzdid ());
-        map.put ("sqysbm", dto.getSqysbm ());
-        map.put ("mzksbm", dto.getMzksbm ());
-        map.put ("fbrq", dto.getFbrq ());
-        map.put ("zdrq", dto.getZdrq ());
-        map.put ("czybm", dto.getCzybm ());
-        map.put ("czyksbm", dto.getCzyksbm ());
-        map.put ("zs", dto.getZs ());
-        map.put ("bs", dto.getBs ());
-        map.put ("clyz", dto.getClyz ());
-        map.put ("jws", dto.getJws ());
-        map.put ("tgjc", dto.getTgjc ());
-        map.put ("gms", dto.getGms ());
-        map.put ("jbbm", dto.getJbbm ());
-        map.put ("jbbm1", dto.getJbbm1 ());
-        map.put ("jbbm2", dto.getJbbm2 ());
-        map.put ("tw", dto.getTw ());
-        map.put ("mb", dto.getMb ());
-        map.put ("hx", dto.getHx ());
-        map.put ("bp", dto.getBp ());
-        map.put ("fzbz", dto.getFzbz ());
-        map.put ("hzqx", dto.getHzqx ());
-        map.put ("sfqc", dto.getSfqc ());
-        map.put ("qchs", dto.getQchs ());
-        map.put ("sfqj", dto.getSfqj ());
-        map.put ("ckrq", dto.getCkrq ());
+        Map<String, Object> map = new HashMap<>();
+        map.put("his_registration_id",dto.getHisRegistrationId());
+        map.put("mzzdid",dto.getMzzdid());
+        map.put("sqysbm",dto.getSqysbm());
+        map.put("mzksbm",dto.getMzksbm());
+        map.put("fbrq",dto.getFbrq());
+        map.put("zdrq",dto.getZdrq());
+        map.put("czybm",dto.getCzybm());
+        map.put("czyksbm",dto.getCzyksbm());
+        map.put("zs",dto.getZs());
+        map.put("bs",dto.getBs());
+        map.put("clyz",dto.getClyz());
+        map.put("jws",dto.getJws());
+        map.put("tgjc",dto.getTgjc());
+        map.put("gms",dto.getGms());
+        map.put("jbbm",dto.getJbbm());
+        map.put("jbbm1",dto.getJbbm1());
+        map.put("jbbm2",dto.getJbbm2());
+        map.put("fzbz",dto.getFzbz());
+        map.put("hzqx",dto.getHzqx());
+        map.put("sfqc",dto.getSfqc());
+        map.put("qchs",dto.getQchs());
+        map.put("sfqj",dto.getSfqj());
+        map.put("jzqk",dto.getJzqk());
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpinimpapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -204,7 +224,7 @@
         Map<String, Object> map = new HashMap<> ();
         map.put ("his_registration_id", hisRegistrationId);
         map.put ("czybm", czybm);
-        map.put ("zflxbm", sqdh);
+        map.put ("sqdh", sqdh);
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpindeltestapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -226,7 +246,9 @@
         map.put ("jcbw", dao.getJcbw ());
         map.put ("sfjz", dao.getSfjz ());
         map.put ("details", dao.getDetails ());
+        log.info("HIS闂ㄨ瘖妫�鏌ョ敵璇� ->{},璇锋眰鍙傛暟 ->{}",HIS_URL+"Outpinexamapply", JSONUtil.toJsonStr(map));
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpinexamapply", map);
+        log.info("HIS闂ㄨ瘖妫�鏌ョ敵璇疯繑鍥� ->{}",post);
         return AjaxResult.success ().put ("data", post);
     }
 
@@ -238,7 +260,7 @@
         Map<String, Object> map = new HashMap<> ();
         map.put ("his_registration_id", hisRegistrationId);
         map.put ("czybm", czybm);
-        map.put ("zflxbm", sqdh);
+        map.put ("sqdh", sqdh);
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelexamapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -269,7 +291,7 @@
         Map<String, Object> map = new HashMap<> ();
         map.put ("his_registration_id", hisRegistrationId);
         map.put ("czybm", czybm);
-        map.put ("zflxbm", sqdh);
+        map.put ("sqdh", sqdh);
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelmedapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -300,7 +322,7 @@
         Map<String, Object> map = new HashMap<> ();
         map.put ("his_registration_id", hisRegistrationId);
         map.put ("czybm", czybm);
-        map.put ("zflxbm", sqdh);
+        map.put ("sqdh", sqdh);
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpintdelreatapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -310,7 +332,7 @@
     public AjaxResult Outpinmedicapply (OutpinmedicapplyDto dao) {
         Map<String, Object> map = new HashMap<> ();
         map.put ("his_registration_id", dao.getHisRegistrationId ());
-        map.put ("sfzh", dao.getHisRegistrationId ());
+        map.put ("sfzh", dao.getSfzh ());
         map.put ("sqysbm", dao.getSqysbm ());
         map.put ("mzksbm", dao.getMzksbm ());
         map.put ("sjrq", dao.getSjrq ());
@@ -318,9 +340,9 @@
         map.put ("czyksbm", dao.getCzyksbm ());
         map.put ("cflxbm", dao.getCflxbm ());
         map.put ("yfbm", dao.getYfbm ());
-        map.put ("fyts", dao.getFyts ());
-        map.put ("mzzd", dao.getMzzd ());
-        map.put ("details", dao.getDetails ());
+        map.put ("fyts","1");
+        map.put ("mzzd","");
+        map.put ("details", dao.getDetails());
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpinmedicapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -332,7 +354,7 @@
         Map<String, Object> map = new HashMap<> ();
         map.put ("his_registration_id", hisRegistrationId);
         map.put ("czybm", czybm);
-        map.put ("zflxbm", sqdh);
+        map.put ("sqdh", sqdh);
         String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelmedicapply", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -499,7 +521,6 @@
 //        map.put ("pationid", pationid);
 //        map.put ("pagecount", pagecount);
 //        map.put ("page", page);
-
         String post = HttpClientUtils.sendPost (HIS_URL+"Getlabreportinfo", map);
         return AjaxResult.success ().put ("data", post);
     }
@@ -662,6 +683,7 @@
         return AjaxResult.success ().put ("data", post);
     }
 
+    // @ApiOperation(value = "2.4.3 鑾峰彇妫�楠岀粨鏋滆褰曚俊鎭�")
     public AjaxResult Getlabdetailinfo (Map<String ,Object> map) {
         String post = HttpClientUtils.sendPost (HIS_URL+"Getlabdetailinfo", map);
         return AjaxResult.success ().put ("data", post);

--
Gitblit v1.8.0