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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/healthUpload/service/BaseDoctorHealthUploadService.java

@@ -39,6 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
@@ -75,6 +76,8 @@ public class BaseDoctorHealthUploadService extends BaseJpaService<BaseDoctorHeal
    private WxPushLogDao wxPushLogDao;
    @Autowired
    private HibenateUtils hibenateUtils;
    @Value("${wechat.id}")
    private String wechatId;
    /**
     * 新增医生成员关系
@@ -211,7 +214,7 @@ public class BaseDoctorHealthUploadService extends BaseJpaService<BaseDoctorHeal
                            }
                            newConfig.setKeyword2(baseDoctorHealthUploadDO.getDoctorName());
                            newConfig.setKeyword3(DateUtil.getStringDate());
                            newConfig.setUrl("https://www.cityihealth.com/hlwyy/healthMonitoring/#/health/commit?id=" + baseDoctorHealthUploadDO.getId() + "&docCode=" + baseDoctorHealthUploadDO.getDoctorId() + "");
                            newConfig.setUrl("https://ehr.yihu.com/hlwyy/healthMonitoring/#/health/commit?id=" + baseDoctorHealthUploadDO.getId() + "&docCode=" + baseDoctorHealthUploadDO.getDoctorId() + "");
                            WxAccessTokenDO wxAccessTokenDO = wxAccessTokenService.getWxAccessTokenById("xm_mlwyy_wx");
                            logger.info("=======setUrl========" + newConfig.getUrl());
                            weixinMessagePushUtils.putWxMsg(wxAccessTokenDO.getAccessToken(), doctorDO.getOpenid(), newConfig);
@@ -1145,12 +1148,20 @@ public class BaseDoctorHealthUploadService extends BaseJpaService<BaseDoctorHeal
                            isOutsideName = "否";
                        }
                        String isNucleateName = "";
                        if (object.getString("isNucleate").equalsIgnoreCase("1")) {
                            isNucleateName = "未做";
                        } else if (object.getString("isNucleate").equalsIgnoreCase("2")) {
                            isNucleateName = "已做（院内）";
                        } else if (object.getString("isNucleate").equalsIgnoreCase("3")) {
                            isNucleateName = "已做（院外）";
                        if (wechatId.equalsIgnoreCase("xm_zjxl_wx")){
                            if (object.getString("isNucleate").equalsIgnoreCase("1")) {
                                isNucleateName = "未做";
                            } else if (object.getString("isNucleate").equalsIgnoreCase("2")) {
                                isNucleateName = "已做";
                            }
                        }else {
                            if (object.getString("isNucleate").equalsIgnoreCase("1")) {
                                isNucleateName = "未做";
                            } else if (object.getString("isNucleate").equalsIgnoreCase("2")) {
                                isNucleateName = "已做（院内）";
                            } else if (object.getString("isNucleate").equalsIgnoreCase("3")) {
                                isNucleateName = "已做（院外）";
                            }
                        }
                        String isOutsideHighName = "";
                        if (object.getString("isOutsideHigh").equalsIgnoreCase("1")) {

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

@@ -3175,6 +3175,7 @@ public class EntranceService {
                            ylzMedicalRelationDO.setItemCount(resultJSON.getString("cfxms0"));
                            ylzMedicalRelationDO.setTotalAmount(resultJSON.getString("bcfyze"));
                            ylzMedicalRelationDO.setPreCharges(resultJSON.getString("bcfyze"));
                            ylzMedicalRelationDO.setBcwkje(resultJSON.getString("bcwkje"));
                            ylzMedicalRelationDO.setPersonAccount("0");
                            ylzMedicalRelationDO.setDataSource("53");
                            ylzMedicalRelationDO.setBalance(cardFee+"");
@@ -3329,6 +3330,7 @@ public class EntranceService {
                            ylzMedicalRelationDO.setItemCount(resultJSON.getString("cfxms0"));
                            ylzMedicalRelationDO.setTotalAmount(resultJSON.getString("bcfyze"));
                            ylzMedicalRelationDO.setPreCharges(resultJSON.getString("bcfyze"));
                            ylzMedicalRelationDO.setBcwkje(resultJSON.getString("bcwkje"));
                            ylzMedicalRelationDO.setDataSource("53");
                            ylzMedicalRelationDO.setPreCount(resultJSON.getString("cfxms0"));
                            ylzMedicalRelationDO.setBalance(cardFee+"");

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1949,9 +1949,10 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(code);
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(code);
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(ylzMedicalRelationDO.getId());
        BigDecimal b1 = new BigDecimal(ylzMedicalRelationDO.getTotalAmount());//总金额
        BigDecimal b1 = new BigDecimal(ylzMedicalRelationDO.getBcwkje());//总金额
        BigDecimal b2 = new BigDecimal(ylzMedicalRelationDO.getPersonAccount());//个人账户
        BigDecimal b3 = new BigDecimal(ylzMedicalRelationDO.getMedicalPrice());//医保总金额
        Double fee = b1.subtract(b2).subtract(b3).doubleValue();
        if (businessOrderDO!=null){
            BasePatientDO patientDO = patientDao.findById(businessOrderDO.getPatient());

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/healthCare/YlzMedicalRelationDO.java

@@ -92,6 +92,7 @@ public class YlzMedicalRelationDO extends UuidIdentityEntity {
    private String balance;//预交金余额
    private String medicalPrice;//医保基金总额
    private Date settleDate;//his结算时间
    private String bcwkje;//本次未扣费用
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name="settle_date")
@@ -730,4 +731,12 @@ public class YlzMedicalRelationDO extends UuidIdentityEntity {
    public void setCollector(String collector) {
        this.collector = collector;
    }
    public String getBcwkje() {
        return bcwkje;
    }
    public void setBcwkje(String bcwkje) {
        this.bcwkje = bcwkje;
    }
}

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -1238,7 +1238,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
wechat:
  id: xm_mlwyy_wx  # base库中,wx_wechat 的id字段
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
# 短信验证码发送的客户端标识,居民端