药柜his结算修改（院内对账不齐），默认值改为取自医保

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/JwService.java

@@ -237,14 +237,14 @@ public class JwService {
                    insurResultTmp.put("psn_cert_type",setlinfo.get("psn_cert_type")); //人员证件类型
                    insurResultTmp.put("certno",setlinfo.get("certno")); //证件号码
                    insurResultTmp.put("gend",setlinfo.get("gend")); //性别
                    insurResultTmp.put("naty",setlinfo.get("naty")); //民族
                    insurResultTmp.put("naty",null==setlinfo.get("naty")?"":setlinfo.get("naty")); //民族
                    insurResultTmp.put("brdy",setlinfo.get("brdy")); //出生日期
                    insurResultTmp.put("age",setlinfo.get("age").toString()); //年龄
                    insurResultTmp.put("insutype","310"); //险种类型
                    insurResultTmp.put("psn_type","11"); //人员类别"
                    insurResultTmp.put("cvlserv_flag","0"); //公务员标志
                    insurResultTmp.put("insutype",ylzMedicalRelationDO.getInsuranceType()); //险种类型 //医保读卡or结算返回
                    insurResultTmp.put("psn_type",setlinfo.get("psn_type")); //人员类别" //医保结算返回
                    insurResultTmp.put("cvlserv_flag",setlinfo.get("cvlserv_flag")); //公务员标志 //医保结算返回
                    insurResultTmp.put("setl_time", setlinfo.get("setl_time"));    //结算时间
                    insurResultTmp.put("mdtrt_cert_type","03");  //就诊凭证类型
                    insurResultTmp.put("mdtrt_cert_type",setlinfo.get("mdtrt_cert_type"));  //就诊凭证类型 取医保结算返回
                    insurResultTmp.put("med_type",setlinfo.get("med_type")); //医疗类别
                    insurResultTmp.put("medfee_sumamt",setlinfo.get("medfee_sumamt").toString());  //医疗费总额
                    insurResultTmp.put("fulamt_ownpay_amt",setlinfo.get("fulamt_ownpay_amt").toString()); //全自费金额
@@ -342,7 +342,7 @@ public class JwService {
        JSONObject insurVisitTmp = new JSONObject();
        insurVisitTmp.put("visit_msgid",ylzMedicalRelationDO.getVisitMsgid());//发送方报文ID"
        insurVisitTmp.put("insuplc_admdvs",ylzMedicalRelationDO.getRegionCode());//参保地医保区划【窗口冲销有用】
        insurVisitTmp.put("insutype","310");//险种类型【挂号时用的险种，医保目前以此为准】
        insurVisitTmp.put("insutype",ylzMedicalRelationDO.getInsuranceType());//医保读卡返回
        insurVisitTmp.put("mdtrt_id",ylzMedicalRelationDO.getHisSerial());//就诊ID  医保挂号接口返回
        insurVisitTmp.put("psn_no",ylzMedicalRelationDO.getPsnNo());//人员编号   医保人员基本信息获取接口返回
        insurVisitTmp.put("ipt_otp_no",ylzMedicalRelationDO.getLogNo());//门诊号

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -1024,7 +1024,7 @@ public class MedOrderService {
                                            if (newYlzRelation){
                                                ylzMedicalRelationDO.setLogNo(VISIT_NO);
                                                ylzMedicalRelationDO.setOrgCode(orgCode);
                                                ylzMedicalRelationDO.setRegionCode("350200");
                                                ylzMedicalRelationDO.setRegionCode("350200");//参保地区划代码 医保读卡返回
                                                ylzMedicalRelationDO.setIdcard(null);
                                                ylzMedicalRelationDO.setName(USER_NAME);
                                                ylzMedicalRelationDO.setCertType("01");