Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/InspectionService.java

@@ -1,7 +1,6 @@
package com.yihu.jw.hospital.prescription.service;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionPartsDictDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -49,6 +49,7 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.QrcodeUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import com.ylzinfo.ehc.EhcHandler;
@@ -1159,7 +1160,31 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     */
    public JSONArray getInspectionDictionary(String pyKey,String winNo)throws Exception{
        return entranceService.MS25002(pyKey,winNo,demoFlag);
        JSONArray rs = entranceService.MS25002(pyKey,winNo,demoFlag);
        if(rs!=null&&rs.size()>0){
            //设置科室翻译名称字典，减少循环层级降低循环次数
            List<DictHospitalDeptDO> depts =dictHospitalDeptDao.findByOrgCode("350211A1002");
            Map<String,String> deptDictMap = new HashedMap();
            for(DictHospitalDeptDO dp:depts){
                deptDictMap.put(dp.getCode(),dp.getName());
            }
            //翻译执行科室
            for(int i=0;i<rs.size();i++){
                JSONObject dict = (JSONObject)rs.get(i);
                String dept = dict.getString("exec_unit");
                if(StringUtils.isNotBlank(dept)){
                    String deptName = deptDictMap.get(dept);
                    if(StringUtils.isNotBlank(deptName)){
                        dict.put("exec_unit_name",deptName);
                    }else{
                        dict.put("exec_unit_name","");
                    }
                }
            }
        }
        return rs;
    }
    /**
@@ -1363,7 +1388,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        json.put("cardNo",outpatientDO.getCardNo());
        json.put("doctor",doctorMappingDO.getMappingCode());
        json.put("dept",outpatientDO.getDept());
        json.put("dept",inspectionDO.getDept());
        json.put("frequency",inspectionDO.getFrequency()); //组号
        json.put("quantity",inspectionDO.getQuantity()); //数量
        json.put("winNo",outpatientDO.getWinNo());
        json.put("chargeFlag",2); //项目类别-必输  1-药品 2检验检查
        /**

business/base-service/src/mqConfig/mqdata/MS53001.json

@@ -34,122 +34,10 @@
				"pack_unit_name": "盒",
				"weigh_unit_name": "mg",
				"vol_unit_name": [],
				"win_no": "6"
				"win_no": "6",
				"jbyw": "国基",
				"gwyp": []
			}
		}
	},
		{
			"head": {
				"fId": "BS35014",
				"version": "2",
				"msgName": "药品字典",
				"sourceSysCode": "S01",
				"targetSysCode": "S60",
				"createTime": "20190529094210"
			},
			"body": {
				"row": {
					"action": "select",
					"charge_code": "07610 ",
					"serial": "01",
					"group_no": "72",
					"drugname": "吡柔比星粉针",
					"dosage": "15  ",
					"mini_unit": "05",
					"pack_size": "1",
					"specification": "10mg/盒",
					"retprice": "120.89",
					"pack_retprice": "120.89",
					"stock_amount": "0",
					"visible_flag": "0",
					"drug_flag": "0",
					"py_code": "BRBXFZ  ",
					"pack_unit": "05",
					"manu_name": "深圳万乐",
					"weigh_unit": "16",
					"vol_unit": [],
					"mini_unit_name": "盒",
					"pack_unit_name": "盒",
					"weigh_unit_name": "mg",
					"vol_unit_name": [],
					"win_no": "6"
				}
			}
		},
		{
			"head": {
				"fId": "BS35014",
				"version": "2",
				"msgName": "药品字典",
				"sourceSysCode": "S01",
				"targetSysCode": "S60",
				"createTime": "20190529094210"
			},
			"body": {
				"row": {
					"action": "select",
					"charge_code": "07759 ",
					"serial": "01",
					"group_no": "72",
					"drugname": "表柔比星粉针（力创",
					"dosage": "15  ",
					"mini_unit": "09",
					"pack_size": "1",
					"specification": "10mg/瓶",
					"retprice": "83.7",
					"pack_retprice": "83.7",
					"stock_amount": "0",
					"visible_flag": "0",
					"drug_flag": "0",
					"py_code": "BRBXFZZL",
					"pack_unit": "09",
					"manu_name": "山东新时代",
					"weigh_unit": "16",
					"vol_unit": [],
					"mini_unit_name": "瓶",
					"pack_unit_name": "瓶",
					"weigh_unit_name": "mg",
					"vol_unit_name": [],
					"win_no": "6"
				}
			}
		},
		{
			"head": {
				"fId": "BS35014",
				"version": "2",
				"msgName": "药品字典",
				"sourceSysCode": "S01",
				"targetSysCode": "S60",
				"createTime": "20190529094210"
			},
			"body": {
				"row": {
					"action": "select",
					"charge_code": "07656 ",
					"serial": "01",
					"group_no": "72",
					"drugname": "丁螺环酮片（奇比特）",
					"dosage": "01  ",
					"mini_unit": "01",
					"pack_size": "40",
					"specification": "5mgx40片/盒",
					"retprice": "0.6945",
					"pack_retprice": "27.78",
					"stock_amount": "0",
					"visible_flag": "0",
					"drug_flag": "0",
					"py_code": "DLHTPPQB",
					"pack_unit": "05",
					"manu_name": "北大医药股份有限公司",
					"weigh_unit": "16",
					"vol_unit": [],
					"mini_unit_name": "片",
					"pack_unit_name": "盒",
					"weigh_unit_name": "mg",
					"vol_unit_name": [],
					"win_no": "6"
				}
			}
		}]
	}]
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyInspectionDO.java

@@ -16,6 +16,12 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    private String outpatientId;//门诊id',
    private String prescriptionId;//处方id',
    private String dept;//执行科室
    private String deptName;//执行科室名称
    private Integer quantity;//数量
    private String frequency;//组号
    private String code;//项目编码',
    private String name;//(检查方法)',
    private String information;//病史与体征',
@@ -36,6 +42,10 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
//    private String dCode;//自定义码',
//    private String execUnit;//执行科室',
//    private String winNo;//院区',
    private String checkbox;//是否拆分 1是,0否
    private String mzpg;//麻醉评估 0否，1有
    private String sfzg;//是否做过 0 否 和 1是
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date createTime;//,
@@ -174,4 +184,60 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    public void setBlzd(String blzd) {
        this.blzd = blzd;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public Integer getQuantity() {
        return quantity;
    }
    public void setQuantity(Integer quantity) {
        this.quantity = quantity;
    }
    public String getFrequency() {
        return frequency;
    }
    public void setFrequency(String frequency) {
        this.frequency = frequency;
    }
    public String getCheckbox() {
        return checkbox;
    }
    public void setCheckbox(String checkbox) {
        this.checkbox = checkbox;
    }
    public String getMzpg() {
        return mzpg;
    }
    public void setMzpg(String mzpg) {
        this.mzpg = mzpg;
    }
    public String getSfzg() {
        return sfzg;
    }
    public void setSfzg(String sfzg) {
        this.sfzg = sfzg;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyInspectionVO.java

@@ -15,6 +15,12 @@ public class WlyyInspectionVO extends UuidIdentityVO {
    private String outpatientId;//门诊id',
    private String prescriptionId;//处方id',
    private String dept;//执行科室
    private String deptName;//执行科室名称
    private Integer quantity;//数量
    private String frequency;//组号
    private String code;//项目编码',
    private String name;//(检查方法)',
    private String information;//病史与体征',
@@ -42,6 +48,10 @@ public class WlyyInspectionVO extends UuidIdentityVO {
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date createTime;//,
    private String checkbox;//是否拆分 1是,0否
    private String mzpg;//麻醉评估 0否，1有
    private String sfzg;//是否做过 0 否 和 1是
    public String getOutpatientId() {
        return outpatientId;
    }
@@ -177,4 +187,60 @@ public class WlyyInspectionVO extends UuidIdentityVO {
    public void setBlzd(String blzd) {
        this.blzd = blzd;
    }
    public Integer getQuantity() {
        return quantity;
    }
    public void setQuantity(Integer quantity) {
        this.quantity = quantity;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getFrequency() {
        return frequency;
    }
    public void setFrequency(String frequency) {
        this.frequency = frequency;
    }
    public String getCheckbox() {
        return checkbox;
    }
    public void setCheckbox(String checkbox) {
        this.checkbox = checkbox;
    }
    public String getMzpg() {
        return mzpg;
    }
    public void setMzpg(String mzpg) {
        this.mzpg = mzpg;
    }
    public String getSfzg() {
        return sfzg;
    }
    public void setSfzg(String sfzg) {
        this.sfzg = sfzg;
    }
}