Merge branch 'dev' of huangwenjie/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/followup/FollowupDrugs.java

@@ -26,7 +26,7 @@ public class FollowupDrugs extends IdEntity {
	//药品分组（糖尿病--胰岛特殊处理）
	private String drugsGroup;
	//次剂量
	private Double dose;
	private String dose;
	//用药单位【字典MEASURE_UNIT_DICT】
	private String unit;
	//用药频率【字典RECIPE_FREQUENCY_DICT】
@@ -65,15 +65,15 @@ public class FollowupDrugs extends IdEntity {
	public void setDrugsGroup(String drugsGroup) {
		this.drugsGroup = drugsGroup;
	}
	public Double getDose() {
	
	public String getDose() {
		return dose;
	}
	public void setDose(Double dose) {
	
	public void setDose(String dose) {
		this.dose = dose;
	}
	
	public String getUnit() {
		return unit;
	}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/FollowupDrugs.java

@@ -26,7 +26,7 @@ public class FollowupDrugs extends IdEntity {
	//药品分组（糖尿病--胰岛特殊处理）
	private String drugsGroup;
	//次剂量
	private Double dose;
	private String dose;
	//用药单位【字典MEASURE_UNIT_DICT】
	private String unit;
	//用药频率【字典RECIPE_FREQUENCY_DICT】
@@ -65,15 +65,15 @@ public class FollowupDrugs extends IdEntity {
	public void setDrugsGroup(String drugsGroup) {
		this.drugsGroup = drugsGroup;
	}
	public Double getDose() {
	
	public String getDose() {
		return dose;
	}
	public void setDose(Double dose) {
	
	public void setDose(String dose) {
		this.dose = dose;
	}
	
	public String getUnit() {
		return unit;
	}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/followup/FollowupDrugsService.java

@@ -85,7 +85,7 @@ public class FollowupDrugsService extends BaseService {
				drug.setDrugsGroup(item.get("drugsGroup"));
				drug.setDrugsCode(item.get("drugsCode"));
				drug.setDrugsName(item.get("drugsName"));
				drug.setDose(Double.valueOf(String.valueOf(item.get("dose"))));
				drug.setDose(item.get("dose"));
				drug.setUnit(item.get("unit"));
				drug.setFrequency(item.get("frequency"));
				drug.setCreateTime(new Date());

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/third/jw/JwPrescriptionService.java

@@ -378,6 +378,9 @@ public class JwPrescriptionService {
                        String idcard = json.getString("IDENTITY_CARD_NO");//身份证号码
                        String medicalNo = json.getString("MEDICAL_NO");//体检编码
                        String patientName = json.getString("SICK_NAME");//姓名
                        if(StringUtils.isNoneBlank(patientName) && patientName.length() >200){
                            patientName = patientName.substring(0,200);
                        }
                        String orgName = json.getString("ORG_NAME");//医院名称
                        String orgCode = json.getString("ORG_CODE");//医院机构编码
                        String jwDoctorCode = json.getString("MEDICAL_OPERATOR");//体检医生
@@ -447,6 +450,7 @@ public class JwPrescriptionService {
                    Integer jwCode = jwData.getInteger("CODE");
                    if (1 == jwCode) {
                        JSONArray dataArray = jwData.getJSONArray("DATA");
                        logger.info("从基卫获取随访信息数量"+ dataArray.size());
                        for (int i = 0; i < dataArray.size(); i++) {
                            Followup followup = new Followup();
                    
@@ -806,10 +810,7 @@ public class JwPrescriptionService {
                                        drug.setDrugsGroup("normal");
                                        drug.setDrugsCode("");
                                        drug.setDrugsName(json.getString("PHYSIC_NAME" + j));//药物名称
                                        if(StringUtils.isNoneBlank(json.getString("PHYSIC_DOSE" + j))){
                                            drug.setDose(Double.valueOf(json.getString("PHYSIC_DOSE" + j)));//剂量
                                        }
                                        
                                        drug.setDose(json.getString("PHYSIC_DOSE" + j));//剂量
                                        drug.setUnit(json.getString("PHYSIC_UNIT" + j));//单位【MEASURE_UNIT_DICT】
                                        drug.setFrequency(json.getString("FREQUENCY" + j));//频次【RECIPE_FREQUENCY_DICT】
                                        drug.setCreateTime(new Date());
@@ -824,9 +825,7 @@ public class JwPrescriptionService {
                                        drug.setDrugsGroup("insulin");
                                        drug.setDrugsCode("");
                                        drug.setDrugsName(json.getString("INSULIN_NAME" + k));//胰岛素药物名称
                                        if(StringUtils.isNoneBlank(json.getString("INSULIN_DOSE" + k))){
                                            drug.setDose(Double.valueOf(json.getString("INSULIN_DOSE" + k)));//胰岛素剂量
                                        }
                                        drug.setDose(json.getString("PHYSIC_DOSE" + k));//剂量
                                        drug.setUnit(json.getString("INSULIN_UNIT" + k));//v单位【MEASURE_UNIT_DICT】
                                        drug.setFrequency(json.getString("INSULIN_FREQUENCY" + k));//胰岛素频次【RECIPE_FREQUENCY_DICT】
                                        drug.setCreateTime(new Date());
@@ -839,6 +838,9 @@ public class JwPrescriptionService {
                        
                                transactionManager.commit(transactionStatus);
                            } catch (Exception ex) {
                                logger.info("查询居民随访记录,开始时间" + startdate + "，结束时间：" + enddate);
                                logger.info("查询居民随访记录,机构" + hospitalMapping.getName() + "，编码：" + hospitalMapping.getCode());
                                logger.info("基卫随访信息报文："+json.toString());
                                logger.info("同步随访信息报错，errmessage:" + ex.toString());
                                transactionManager.rollback(transactionStatus);
                                continue;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowupDrugsService.java

@@ -85,7 +85,7 @@ public class FollowupDrugsService extends BaseService {
				drug.setDrugsGroup(item.get("drugsGroup"));
				drug.setDrugsCode(item.get("drugsCode"));
				drug.setDrugsName(item.get("drugsName"));
				drug.setDose(Double.valueOf(String.valueOf(item.get("dose"))));
				drug.setDose(item.get("dose"));
				drug.setUnit(item.get("unit"));
				drug.setFrequency(item.get("frequency"));
				drug.setCreateTime(new Date());