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/doctor/service/BaseDoctorInfoService.java

@@ -8,6 +8,7 @@ import com.yihu.jw.doctor.dao.DoctorSpecialDiseaseDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.doctor.DoctorSpecialDiseaseDo;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
@@ -23,6 +24,7 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
@@ -199,6 +201,7 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
    public Object queryById(String doctorId,String typeCode) {
        Map<String,Object> params = new HashedMap();
        String sql ="SELECT " +
                " a.id AS \"id\", " +
                " a.NAME AS \"name\", " +
                " a.job_title_name AS \"jobTitleName\", " +
                " a.introduce AS \"introduce\", " +
@@ -208,8 +211,8 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                " b.dept_name AS \"deptName\", " +
                " b.org_name AS \"orgName\", " +
                " c.mapping_code AS \"jobNumber\", " +
                " d.disease_name AS \"diseaseName\", " +
                " d.disease_code AS \"diseaseCode\", " +
/*                " d.disease_name AS \"diseaseName\", " +
                " d.disease_code AS \"diseaseCode\", " +*/
                " e.req_fee AS \"money\" ," +
                " h.dept_type_code AS \"deptTypeCode\" ," +
                "\tm.req_fee as \"twfzFee\",\n" +
@@ -229,7 +232,7 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                " LEFT JOIN base_doctor_hospital b ON a.id = b.doctor_code " +
                " LEFT JOIN base_doctor_mapping c ON a.id = c.doctor " +
                " LEFT JOIN dict_hospital_dept h ON b.dept_code = h.code " +
                " LEFT JOIN wlyy_doctor_special_disease d ON a.id = d.doctor_code " +
/*                " LEFT JOIN wlyy_doctor_special_disease d ON a.id = d.doctor_code " +*/
                " LEFT JOIN wlyy_charge_dict e ON a.charge_type = e.charge_type " +
                " LEFT JOIN wlyy_charge_dict m ON a.twfz_charge_type = m.charge_type and m.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict n ON a.spfz_charge_type = n.charge_type and n.is_del='1'\n" +
@@ -252,30 +255,24 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql, params);
        StringBuilder disease = new StringBuilder();
        StringBuilder code = new StringBuilder();
        String diseaseName = "";
        String diseaseCode = "";
        if (null != list && list.size() > 0){
            if (list.size() == 1){
                return  list.get(0);
            }else {
                for (int i=0;i<list.size();i++){
                    if (i == 0 ){
                        if (list.get(i).get("diseaseName")!=null){
                            disease.append(list.get(i).get("diseaseName"));
                            code.append(list.get(i).get("diseaseCode"));
                        }
                    }else {
                        if (list.get(i).get("diseaseName")!=null){
                            disease.append(","+list.get(i).get("diseaseName"));
                            code.append(","+list.get(i).get("diseaseCode"));
                        }
                    }
                }
                list.get(0).put("diseaseName",disease);
                list.get(0).put("diseaseCode",code);
                return  list.get(0);
            Map<String,Object> map = list.get(0);
            List<DoctorSpecialDiseaseDo> specialDiseaseDoList = specialDiseaseDao.findByDoctorCode(map.get("id").toString());
            for (DoctorSpecialDiseaseDo diseaseDo:specialDiseaseDoList){
                disease.append(diseaseDo.getDiseaseName()+",");
                code.append(diseaseDo.getDiseaseCode()+",");
            }
            logger.info("disease"+disease+"===code==="+disease);
            if (StringUtils.isNoneBlank(disease)){
                diseaseName = disease.substring(0,disease.length()-1);
                diseaseCode = code.substring(0,code.length()-1);
            }
            list.get(0).put("diseaseName",diseaseName);
            list.get(0).put("diseaseCode",diseaseCode);
            return  list.get(0);
        }
        return null;
    }

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

@@ -3158,7 +3158,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            prescriptionDao.save(prescription);
            //记录开发失败日志
            prescriptionLogService.addPrescriptionLog(prescription.getId(), 13, 2, outpatientDO.getDoctor(), outpatientDO.getDoctorName(), "", new Date());
            return result;
        }
    }
@@ -3258,6 +3257,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        json.put("unit", info.getUnit());
        json.put("usage", info.getUsageCode());
        json.put("supplyCode", info.getSupplyCode());
        json.put("sfybxm",info.getSfybxm());
        if (StringUtils.isNotBlank(info.getDays())) {
            json.put("days", info.getDays());
        } else {
@@ -4780,13 +4780,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            //医保是否有处方权
            if(healthCareService.isHospitalFlag()){
                String doctorAuthenticationUrl = entranceHealthCareUrl + "doctorAuthentication?doctorId="+doctorDO.getId();
                String infoResponse = httpClientUtil.get(doctorAuthenticationUrl,"GBK");
                com.alibaba.fastjson.JSONObject doctorAuthentication = com.alibaba.fastjson.JSONObject.parseObject(infoResponse);
                if(doctorAuthentication.getInteger("status")==200){
                    rs.put("is_prescribe", doctorAuthentication.get("obj"));//is_prescribe	是否具备处方权	1-有处方权，0无处方权
                if (wechatId.equalsIgnoreCase("xm_xzzx_wx")){
                    String doctorAuthenticationUrl = entranceHealthCareUrl + "doctorAuthentication?doctorId="+doctorDO.getId();
                    String infoResponse = httpClientUtil.get(doctorAuthenticationUrl,"GBK");
                    com.alibaba.fastjson.JSONObject doctorAuthentication = com.alibaba.fastjson.JSONObject.parseObject(infoResponse);
                    if(doctorAuthentication.getInteger("status")==200){
                        rs.put("is_prescribe", doctorAuthentication.get("obj"));//is_prescribe	是否具备处方权	1-有处方权，0无处方权
                    }else {
                        rs.put("is_prescribe",0);
                    }
                }else {
                    rs.put("is_prescribe",0);
                    rs.put("is_prescribe", healthCareService.doctorAuthentication(doctorDO.getId()));//is_prescribe	是否具备处方权	1-有处方权，0无处方权
                }
            }else{
                rs.put("is_prescribe", 0);//is_prescribe	是否具备处方权	1-有处方权，0无处方权
@@ -9719,7 +9723,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param prescriptionId
     * @return
     */
    public WlyyPrescriptionCheckDO saveCheck(String operate, String operateName, String reason, Integer status, String prescriptionId, String wxId,String ip) {
    public WlyyPrescriptionCheckDO saveCheck(String operate, String operateName, String reason, Integer status, String prescriptionId, String wxId,String ip) throws Exception {
        WlyyPrescriptionCheckDO prescriptionCheckDO = new WlyyPrescriptionCheckDO();
        prescriptionCheckDO.setCreateTime(new Date());
        prescriptionCheckDO.setOperate(operate);
@@ -9743,7 +9747,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            List<WlyyPrescriptionExpressageDO> expressageDOS = prescriptionExpressageDao.findByOutpatientId(outpatientDO.getId());
            if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
                try {
                    //his处方拼接开方条件
                    com.alibaba.fastjson.JSONArray jsonData = new com.alibaba.fastjson.JSONArray();
                    for (WlyyPrescriptionInfoDO info : infoDOS) {
@@ -9830,9 +9833,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                    //sendHisDiagnosis(jsonData, outpatientDO, wlyyPrescriptionDO);
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }else if (wxId.equalsIgnoreCase("xm_xzzx_wx")){
                try {
@@ -14421,11 +14421,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
                logger.info("电子发票开具开始");
                /*try {
                try {
                    entranceService.dzpjServer(patientMappingDO.getMappingCode(),realOrder);
                }catch (Exception e){
                    e.printStackTrace();
                }*/
                }
                logger.info("电子发票开具结束");
            }

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

@@ -1024,6 +1024,9 @@ public class EntranceService {
                if (StringUtils.isNotBlank(vo.getQuantity())) {
                    sbs.append(" quantity=\"" + vo.getQuantity() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getSfybxm())) {
                    sbs.append(" sfybxm=\"" + vo.getSfybxm() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getGroupNo())) {
                    sbs.append(" group_no=\"" + vo.getGroupNo() + "\"");
                }

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

@@ -164,6 +164,19 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
     */
    private String pzwh;
    /**
     * sfybxm 是否医保项目 Y：是， N：否
     */
    private String sfybxm;
    @Column(name = "sfybxm")
    public String getSfybxm() {
        return sfybxm;
    }
    public void setSfybxm(String sfybxm) {
        this.sfybxm = sfybxm;
    }
    @Column(name = "prescription_id")
    public String getPrescriptionId() {

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

@@ -147,6 +147,15 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    private String idnoType;
    private String sfybxm;
    public String getSfybxm() {
        return sfybxm;
    }
    public void setSfybxm(String sfybxm) {
        this.sfybxm = sfybxm;
    }
    public String getIdnoType() {
        return idnoType;

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

@@ -160,6 +160,15 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    private String pzwh;
    private String sfybxm;
    public String getSfybxm() {
        return sfybxm;
    }
    public void setSfybxm(String sfybxm) {
        this.sfybxm = sfybxm;
    }
    public String getPrescriptionId() {
        return prescriptionId;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -2666,7 +2666,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            String doctorId = getUID();
            if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
                return ObjEnvelop.getSuccess("ok", xzzxEntranceService.selectHistoryEmrFromEntrance(patient, null));
            } else if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
            } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
                return ObjEnvelop.getSuccess("ok", hcyyPrescriptionService.selectHistoryEmrFromEntrance(patient, null));
            } else {
                return ObjEnvelop.getSuccess("ok", prescriptionService.outpatient(patient, doctorId));