Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -2275,7 +2275,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("0".equals(rs)) {
            String admNo = jsonObject.getString("@ADM_NO");
            String realOrder = jsonObject.getString("@real_order");
            String voucherNo = jsonObject.getString("@xtgzh0");
            prescription.setAdmNo(admNo);
            prescription.setRealOrder(realOrder);
            prescriptionDao.save(prescription);
@@ -2283,6 +2283,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            outpatientDao.save(outpatientDO);
            result.put("code", 1);
            result.put("voucherNo",voucherNo);
            result.put("mes", "开方提交成功");
            return result;
@@ -3190,6 +3191,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                BaseOrgDO org = baseOrgDao.findByCode(orgCode);
                if (org!=null){
                    doctorHospitalDO.setWinNo(org.getWinNo());
                    doctorHospitalDO.setHisId(org.getHisId());
                    hospitalDOList.add(doctorHospitalDO);
                }
            }
@@ -6122,6 +6124,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
                            applyDepaName = doctorHospitalDOS.get(0).getDeptName();
                        }
                        String voucherNo = map.get("voucherNo")+"";
                        String applyDoctorName = prescriptionDO.getDoctorName();
                        BasePatientDO patientDO = basePatientDao.findById(patientCode);
                        String userName = null;
@@ -6140,7 +6143,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            cardNo = outpatientDO.getCardNo();
                        }
                        logger.info("cardNo:"+cardNo);
                        ylzPayService.msgPush("01",cardNo,"01",patientDO.getMobile(),"00",userNo,userName,idcard,realerOrder,applyDepaName,applyDoctorName,recipeTime,free,"1");
                        ylzPayService.msgPush("01",cardNo,"01",patientDO.getMobile(),"00",userNo,userName,idcard,voucherNo,applyDepaName,applyDoctorName,recipeTime,free,"1");
                    }
                    //sendHisDiagnosis(jsonData, outpatientDO, wlyyPrescriptionDO);
@@ -6154,6 +6157,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            wlyyPrescriptionDO.setCheckReason(reason);
            wlyyPrescriptionDO.setStatus(20);
            wlyyPrescriptionDO.setPrescribeTime(new Date());
            wlyyPrescriptionDO.setId(prescriptionId);
            //发送系统消息 处方支付提醒
            SystemMessageDO messageDO = new SystemMessageDO();
@@ -6184,6 +6188,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            }
        }else{
            wlyyPrescriptionDO.setId(prescriptionId);
            wlyyPrescriptionDO.setCheckStatus(status);
            wlyyPrescriptionDO.setCheckReason(reason);
            wlyyPrescriptionDO.setStatus(11);

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorHospitalDO.java

@@ -61,6 +61,12 @@ public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
	 */
	private String del;
    /**
     * hisid
     *
     */
	private String hisId;
	public BaseDoctorHospitalDO(){}
	public BaseDoctorHospitalDO(String orgCode, String orgName, String doctorDutyCode, String doctorDutyName){
@@ -144,4 +150,13 @@ public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
    @Transient
    public String getHisId() {
        return hisId;
    }
    public void setHisId(String hisId) {
        this.hisId = hisId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

@@ -160,6 +160,11 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
     * 机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾 默认1
     */
    private String winNo;
    /**
     * 医院code
     */
    private String hisId;
	
//	/**
//	 * 排序
@@ -421,4 +426,13 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
    @Column(name = "his_id")
    public String getHisId() {
        return hisId;
    }
    public void setHisId(String hisId) {
        this.hisId = hisId;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -59,7 +59,7 @@ public class IotRequestMapping {
     * 第三方调用物联网接口 需要accesstoken
     */
    public static class ThirdOpen{
        public static final String bindUser = "bindUser";
        public static final String registedevice = "registedevice";
        public static final String inputWeRunData = "inputWeRunData";
        public static final String uploadData = "uploadData";
        public static final String updateData = "updateData";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/SurveyScreenResultVo.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
/**
@@ -37,6 +36,8 @@ public class SurveyScreenResultVo{
    //
    @ApiModelProperty("居民code")
    private String patientCode;
    @ApiModelProperty("居民头像")
    private String photo;
    //
    @ApiModelProperty("居民openid")
    private String openId;
@@ -442,4 +443,12 @@ public class SurveyScreenResultVo{
    public void setStartTimeReservation(String startTimeReservation) {
        this.startTimeReservation = startTimeReservation;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
}