Merge branch 'master' of http://47.103.65.67:3000/yeguodong/web_server

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

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

@@ -5,7 +5,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
+import thyyxxk.webserver.config.exception.BizException;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
+import thyyxxk.webserver.constants.sidicts.MdtrtCertType;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.markmtfees.ModifyFundAmt;
 import thyyxxk.webserver.entity.markmtfees.SiMzBusinessParams;
@@ -58,11 +60,19 @@ public class MarkMtFeesController {
     @PassToken
     @PostMapping("/calculateCost")
     public Map<String, Object> settlement(@RequestBody SiMzBusinessParams param) {
+        MdtrtCertType mdtrtCertType = MdtrtCertType.get(param.getReadCardType());
+        if(mdtrtCertType == null) {
+            throw new BizException("请先读卡！");
+        }
         MzPatientInfo mz = new MzPatientInfo();
         mz.setPatNo(param.getPatientId());
         mz.setTimes(param.getTimes());
         mz.setStaffId(param.getStaffId());
         mz.setAcctUsedFlag(param.getAcctUsedFlag());
+        mz.setReadCardBizType(param.getReadCardType());
+        mz.setReadCardResult(param.getReadCardResult());
+        mz.setBusCardInfo(param.getBusCardInfo());
+        mz.setMdtrtCertType(mdtrtCertType.getLabel());
         ResultVo<FundDetail> result = mzService.outpatientSettlement(mz);
         return getStringObjectMap(param, result, "收费窗口门诊统筹结算");
     }

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

@@ -56,6 +56,12 @@ public class SiInventoryController {
         return service.returnGoodsItem(selinfo);
     }
 
+    @PassToken
+    @PostMapping("/selectSalesGoodsItem")
+    public ResultVo<JSONObject> selectSalesGoodsItem(@RequestBody Map<String, Object> selinfo) {
+        return service.selectSalesGoodsItem(selinfo);
+    }
+
     @PassToken
     @PostMapping("/returnGoods")
     public ResultVo<String> returnGoods(@RequestBody List<PurcinfoBought> purcinfo) {

src/main/java/thyyxxk/webserver/entity/medicalinsurance/query/QryPsnBsInfo.java

@@ -19,6 +19,7 @@ public class QryPsnBsInfo {
     private String socialNo;
     private String name;
     private String admdvs;
+    private String psnName;
 
     private String staffId;
     private Integer onlyQry;

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

@@ -129,6 +129,17 @@ public class SiInventoryService {
         return SiUtil.makeReturnWithoutOutputOfElseInfo(result);
     }
 
+    public ResultVo<JSONObject> selectSalesGoodsItem(Map<String, Object> codg) {
+        log.info("------------selectSalesGoodsItem------------");
+        log.info("selinfo=" + JSONObject.toJSONString(codg));
+        codg.put("fixmedins_code", sysCfg.getInstitutionId());
+        String ref = JSONObject.toJSONString(codg);
+        JSONObject input = exec.makeTradeHeader(SiFunction.SELECT_COMMODITY_SALES);
+        input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
+        JSONObject result = exec.executeTrade(input, SiFunction.SELECT_COMMODITY_SALES);
+        return SiUtil.makeReturnWithoutOutputOfElseInfo(result);
+    }
+
     public ResultVo<JSONObject> selectDownloadCodgBchno(YpCodgDownload codg) {
         String ref = JSONObject.toJSONString(codg);
         JSONObject input = exec.makeTradeHeader(SiFunction.DOWNLOAD_CODG_BCHNO);

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

@@ -98,6 +98,7 @@ public class SiQueryService {
             JSONObject qrinfo = JSONObject.parseObject(qryPsnBsInfo.getReadCardResult());
             data.put("mdtrt_cert_no", qrinfo.getString("ecToken"));
             data.put("certno", qrinfo.getString("idNo"));
+            data.put("psn_name", qrinfo.getString("userName"));
         }
 
         input.getJSONObject("input").put("data", data);