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

@@ -537,7 +537,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        prescriptionExpressageDao.save(expressageDO);
        //3.创建候诊室
        createRoom(outpatient,registerTimeDO==null?null:registerTimeDO.getStartTime());
        createRoom(outpatient);
        return outpatient;
    }
@@ -547,7 +547,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param outpatientDO
     * @return
     */
    public Boolean createRoom(WlyyOutpatientDO outpatientDO,Date reservationTime){
    public Boolean createRoom(WlyyOutpatientDO outpatientDO){
        WlyyHospitalWaitingRoomDO waitingRoom = new WlyyHospitalWaitingRoomDO();
@@ -558,7 +558,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        waitingRoom.setPatientId(outpatientDO.getPatient());
        waitingRoom.setPatientName(outpatientDO.getPatientName());
        waitingRoom.setReservationTime(reservationTime);
        waitingRoom.setReservationTime(outpatientDO.getRegisterDate());
        waitingRoom.setVisitStatus(0);
        waitingRoom.setReservationType(1);
        waitingRoom.setSort(0);
@@ -2243,10 +2243,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("clientId", "ihealth_pa8DIRJasL"));
        params.add(new BasicNameValuePair("clientSecret", "jkzl1h7aj39dnasyi23fnkv92"));
        params.add(new BasicNameValuePair("code", "334e4232777e4edabea4a4334bf1997c"));
        params.add(new BasicNameValuePair("openid","oULM4xIoqe3DwEClan_Rq-bQ4JDE"));
        String res = null;
        res = httpClientUtil.post("http://www.xmtyw.cn/wlyy/iHealth/userInfo", params, "UTF-8");
        params.add(new BasicNameValuePair("code", "b60bab0617c04b23b7fa0a059cc83eb6"));
        params.add(new BasicNameValuePair("openid","oULM4xAj9sOsHJ95ttKYd_Fjh6Hc"));
        String res = httpClientUtil.post("http://www.xmtyw.cn/wlyy/iHealth/userInfo", params, "UTF-8");
        return res;
    }
    

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

@@ -57,6 +57,16 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
     */
    private String unitName;
    /**
     * 包装单位
     */
    private String packUnit;
    /**
     * 包装单位名称
     */
    private String packUnitName;
    /**
     * 用法
     */
@@ -107,6 +117,11 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
     */
    private String usageName;
    /**
     *包装价格
     */
    private Double packRetprice;
    @Column(name = "prescription_id")
    public String getPrescriptionId() {
@@ -258,4 +273,31 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    public void setUsageName(String usageName) {
        this.usageName = usageName;
    }
    @Column(name = "pack_unit")
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
    @Column(name = "pack_unit_name")
    public String getPackUnitName() {
        return packUnitName;
    }
    public void setPackUnitName(String packUnitName) {
        this.packUnitName = packUnitName;
    }
    @Column(name = "pack_retprice")
    public Double getPackRetprice() {
        return packRetprice;
    }
    public void setPackRetprice(Double packRetprice) {
        this.packRetprice = packRetprice;
    }
}

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

@@ -66,6 +66,18 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "用量单位名稱", example = "模块1")
    private String unitName;
    /**
     * 包装单位
     */
    @ApiModelProperty(value = "包装单位", example = "模块1")
    private String packUnit;
    /**
     * 包装单位名称
     */
    @ApiModelProperty(value = "包装单位名称", example = "模块1")
    private String packUnitName;
    /**
     * 频率
     */
@@ -111,6 +123,12 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "规格", example = "模块1")
    private String specification;
    /**
     *包装价格
     */
    @ApiModelProperty(value = "包装价格", example = "模块1")
    private Double packRetprice;
    /**
     * 1可用 0删除
     */
@@ -250,4 +268,28 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    public void setUsageName(String usageName) {
        this.usageName = usageName;
    }
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
    public String getPackUnitName() {
        return packUnitName;
    }
    public void setPackUnitName(String packUnitName) {
        this.packUnitName = packUnitName;
    }
    public Double getPackRetprice() {
        return packRetprice;
    }
    public void setPackRetprice(Double packRetprice) {
        this.packRetprice = packRetprice;
    }
}