goods

src/main/java/thyyxxk/webserver/constants/sidicts/SiFunction.java

@@ -352,22 +352,22 @@ public enum SiFunction {
     /**
      * 通过此交易上传商品盘存信息（商品盘存上传）
      */
-    UPLOAD_COMMODITY_INVENTORY("3501A", "商品盘存上传"),
+    UPLOAD_COMMODITY_INVENTORY("3501", "商品盘存上传"),
 
     /**
      * 通过此交易上传商品的库存变化（商品库存变更）
      */
-    CHANGE_COMMODITY_INVENTORY("3502A", "商品库存变更"),
+    CHANGE_COMMODITY_INVENTORY("3502", "商品库存变更"),
 
     /**
      * 通过此交易上传商品采购信息（商品采购）
      */
-    UPLOAD_COMMODITY_PURCHASE("3503A", "商品采购"),
+    UPLOAD_COMMODITY_PURCHASE("3503", "商品采购"),
 
     /**
      * 通过此交易上传商品采购退货信息（商品采购退货）
      * */
-    UPLOAD_COMMODITY_PURCHASE_RETURN("3504A", "商品采购退货"),
+    UPLOAD_COMMODITY_PURCHASE_RETURN("3504", "商品采购退货"),
 
     /**
      * 通过此交易上传商品销售信息（商品销售）
@@ -379,6 +379,11 @@ public enum SiFunction {
      */
     UPLOAD_COMMODITY_SALES_RETURN("3506", "商品销售退货"),
 
+    /**
+     * 通过此交易查询商品销售信息（商品入库信息查询）
+     */
+    SELECT_COMMODITY_INVENTORY("3512", "商品入库信息查询"),
+
     /**
      * 通过此交易查询商品销售信息（商品销售信息查询）
      */

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiDownloadController.java

@@ -7,6 +7,7 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.medicalinsurance.download.DwnldPrm;
 import thyyxxk.webserver.service.medicalinsurance.SiDownloadService;
 
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -40,4 +41,10 @@ public class SiDownloadController {
     public ResultVo<String> fillPsnPayProp() {
         return service.fillPsnPayProp();
     }
+
+    @PassToken
+    @GetMapping("/importDown")
+    public void importDown() throws IOException {
+        service.importDown();
+    }
 }

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiInventoryController.java

@@ -38,6 +38,12 @@ public class SiInventoryController {
         return service.modifyInvinfo(invinfo);
     }
 
+    @PassToken
+    @PostMapping("/modifyInvinfoItem")
+    public ResultVo<JSONObject> modifyInvinfoItem(@RequestBody InvinfoModify invinfo) {
+        return service.modifyInvinfoItem(invinfo);
+    }
+
     @PassToken
     @PostMapping("/purchaseGoods")
     public ResultVo<String> purchaseGoods(@RequestBody List<PurcinfoBought> purcinfo) {
@@ -62,6 +68,12 @@ public class SiInventoryController {
         return service.selectSalesGoodsItem(selinfo);
     }
 
+    @PassToken
+    @PostMapping("/selectModifyInvinfoItem")
+    public ResultVo<JSONObject> selectModifyInvinfoItem(@RequestBody Map<String, Object> selinfo) {
+        return service.selectModifyInvinfoItem(selinfo);
+    }
+
     @PassToken
     @PostMapping("/returnGoods")
     public ResultVo<String> returnGoods(@RequestBody List<PurcinfoBought> purcinfo) {

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

@@ -15,11 +15,14 @@ import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.constants.sidicts.SiFunction;
 import thyyxxk.webserver.dao.his.medicalinsurance.SiDownloadDao;
 import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.medicalinsurance.download.DldDictList;
 import thyyxxk.webserver.entity.medicalinsurance.download.*;
 import thyyxxk.webserver.service.externalhttp.SiExecSrvc;
 import thyyxxk.webserver.utils.*;
 
+import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
@@ -1158,4 +1161,80 @@ public class SiDownloadService {
         return 0;
     }
 
+    public void importDown() throws IOException {
+        File file = new File("D:\\his\\接口\\医保\\111.xlsx");
+        List<List<String>> data = ExcelReaderUtil.readExcel(file);
+        System.out.println("-------data-------");
+
+        // 打印读取到的数据
+
+        try {
+            for (List<String> row : data) {
+                List<SiDlMdcnSrvc> siDlMdcnSrvcList = new ArrayList<>();
+                    if(StringUtil.isNotEmpty(row.get(2))) {
+                        SiDlMdcnSrvc srvc = new SiDlMdcnSrvc();
+                        srvc.setCode(row.get(2) + "-" + row.get(0));
+                        srvc.setServiceName(row.get(3));
+                        srvc.setChargeUnit(row.get(6));
+                        srvc.setExcludeContent(row.get(5));
+                        srvc.setConnotation(row.get(4));
+                        siDlMdcnSrvcList.add(srvc);
+
+//                        dnlddao.insertMdcnSrvc(srvc);
+
+                        try {
+                            dnlddao.insertMdcnSrvcBatch(siDlMdcnSrvcList);
+                        } catch (Exception e) {
+                            System.out.println(row);
+                        }
+                    }
+
+            }
+
+        } catch (Exception e) {
+            //e.printStackTrace();
+
+        }
+
+
+    }
+
+    public void updateDown() throws IOException {
+        File file = new File("D:\\his\\接口\\医保\\111.xlsx");
+        List<List<String>> data = ExcelReaderUtil.readExcel(file);
+        System.out.println("-------data-------");
+
+        // 打印读取到的数据
+
+        try {
+            for (List<String> row : data) {
+                List<SiDlMdcnSrvc> siDlMdcnSrvcList = new ArrayList<>();
+                if(StringUtil.isNotEmpty(row.get(2))) {
+                    SiDlMdcnSrvc srvc = new SiDlMdcnSrvc();
+                    srvc.setCode(row.get(2) + "-" + row.get(0));
+                    srvc.setServiceName(row.get(3));
+                    srvc.setChargeUnit(row.get(6));
+                    srvc.setExcludeContent(row.get(5));
+                    srvc.setConnotation(row.get(4));
+                    siDlMdcnSrvcList.add(srvc);
+
+//                        dnlddao.insertMdcnSrvc(srvc);
+
+                    try {
+                        dnlddao.insertMdcnSrvcBatch(siDlMdcnSrvcList);
+                    } catch (Exception e) {
+                        System.out.println(row);
+                    }
+                }
+
+            }
+
+        } catch (Exception e) {
+            //e.printStackTrace();
+
+        }
+
+
+    }
+
 }

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

@@ -22,6 +22,7 @@ import thyyxxk.webserver.utils.TokenUtil;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -53,6 +54,17 @@ public class SiInventoryService {
         return SiUtil.makeReturnWithoutOutputOfElseInfo(result);
     }
 
+    public ResultVo<JSONObject> modifyInvinfoItem(InvinfoModify invinfo) {
+        invinfo.setFixmedinsHilistId(sysCfg.getInstitutionId());
+        invinfo.setFixmedinsHilistName(sysCfg.getInstitutionName());
+        invinfo.setInvChgTime(new Date());
+        String ref = JSONArray.toJSONStringWithDateFormat(invinfo, "yyyy-MM-dd HH:mm:ss");
+        JSONObject input = exec.makeTradeHeader(SiFunction.CHANGE_COMMODITY_INVENTORY);
+        input.getJSONObject("input").put("invinfo", JSONArray.parseObject(ref));
+        JSONObject result = exec.executeTrade(input, SiFunction.CHANGE_COMMODITY_INVENTORY);
+        return SiUtil.makeReturnWithoutOutputOfElseInfo(result);
+    }
+
     public ResultVo<String> purchaseGoods(List<PurcinfoBought> purcinfo) {
         String ref = JSONArray.toJSONString(purcinfo);
         JSONObject input = exec.makeTradeHeader(SiFunction.UPLOAD_COMMODITY_PURCHASE);
@@ -93,13 +105,15 @@ public class SiInventoryService {
     public ResultVo<JSONObject> saleGoodsItem(Map<String, Object> selinfo) {
         log.info("------------saleGoodsItem------------");
         log.info("selinfo=" + JSONObject.toJSONString(selinfo));
-        selinfo.put("fixmedins_hilist_id", sysCfg.getInstitutionId());
-        selinfo.put("fixmedins_hilist_name", sysCfg.getInstitutionName());
+//        selinfo.put("fixmedins_hilist_id", sysCfg.getInstitutionId());
+//        selinfo.put("fixmedins_hilist_name", sysCfg.getInstitutionName());
         selinfo.put("prsc_dr_name", UriEncoder.decode(String.valueOf(selinfo.get("prsc_dr_name"))));
         selinfo.put("phar_name", UriEncoder.decode(String.valueOf(selinfo.get("phar_name"))));
         selinfo.put("psn_name", UriEncoder.decode(String.valueOf(selinfo.get("psn_name"))));
         selinfo.put("sel_retn_opter_name", UriEncoder.decode(String.valueOf(selinfo.get("sel_retn_opter_name"))));
+        selinfo.put("fixmedins_hilist_name", UriEncoder.decode(String.valueOf(selinfo.get("fixmedins_hilist_name"))));
         String ref = JSONObject.toJSONString(selinfo);
+        log.info("ref=" + ref);
         JSONObject input = exec.makeTradeHeader(SiFunction.UPLOAD_COMMODITY_SALES);
         input.getJSONObject("input").put("selinfo", JSONObject.parseObject(ref));
         JSONObject result = exec.executeTrade(input, SiFunction.UPLOAD_COMMODITY_SALES);
@@ -135,6 +149,17 @@ public class SiInventoryService {
         return SiUtil.makeReturnWithoutOutputOfElseInfo(result);
     }
 
+    public ResultVo<JSONObject> selectModifyInvinfoItem(Map<String, Object> codg) {
+        log.info("------------selectModifyInvinfoItem------------");
+        log.info("selinfo=" + JSONObject.toJSONString(codg));
+        codg.put("fixmedins_code", sysCfg.getInstitutionId());
+        String ref = JSONObject.toJSONString(codg);
+        JSONObject input = exec.makeTradeHeader(SiFunction.SELECT_COMMODITY_INVENTORY);
+        input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
+        JSONObject result = exec.executeTrade(input, SiFunction.SELECT_COMMODITY_INVENTORY);
+        return SiUtil.makeReturnWithoutOutputOfElseInfo(result);
+    }
+
     public ResultVo<JSONObject> selectSalesGoodsItem(Map<String, Object> codg) {
         log.info("------------selectSalesGoodsItem------------");
         log.info("selinfo=" + JSONObject.toJSONString(codg));