Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/pom.xml

@@ -133,6 +133,11 @@
            <version>1.8.9.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
    </dependencies>
    <build>
        <resources>

business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/AppointmentService.java

@@ -142,13 +142,7 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
        if(res!=null){
            logger.info(res.toString());
            String code = res.getString("code");
            if(StringUtils.isNotBlank(code)&&"-1".equals(code)){
                wlyyAppointmentDO.setStatus(1);
            }else {
                wlyyAppointmentDO.setStatus(0);
            }
            wlyyAppointmentDO.setStatus(1);
        }else{
            wlyyAppointmentDO.setStatus(0);
        }

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

@@ -42,14 +42,11 @@ import com.yihu.jw.restmodel.base.org.BaseOrgVO;
import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalSysDictVO;
import com.yihu.jw.restmodel.hospital.doctor.WlyyDoctorWorkTimeVO;
import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.QrcodeUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import com.ylzinfo.ehc.EhcHandler;
@@ -59,7 +56,6 @@ import com.ylzinfo.ehc.trans.TransResponse;
import jxl.write.*;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.collections.functors.InstantiateFactory;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -74,11 +70,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.Boolean;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
 * Created by Trick on 2019/5/17
@@ -1610,6 +1604,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            json.put("days",StringUtils.isNotBlank(info.getPostCount())?info.getPostCount():"1");
        }
        json.put("frequency",info.getFrequency());
        json.put("comm",info.getComm());
        //设置诊断
        setIcd10(json,Icd10);
@@ -3911,4 +3906,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        return entranceService.BS16010(doctorMappingDO.getMappingCode(),demoFlag);
    }
    /**
     *
     * @param name
     * @param hospital
     * @return
     */
    public List<WlyyHospitalSysDictDO> findByDict(String name,String hospital){
        return sysDictDao.findByHospitalAndDictNameOrderBySortAsc(hospital,name);
    }
}

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

@@ -270,7 +270,7 @@ public class EntranceService {
                                    //初始化处方
                                    wlyyPrescriptionVO = initWlyyPrescriptionVo(new WlyyPrescriptionVO(), jsonObjectBody, realOrder);
                                    wlyyPrescriptionVO.setHospital("350211A1002");
                                    wlyyPrescriptionVO.setHospitalName("厦门市中山医院");
                                    wlyyPrescriptionVO.setHospitalName("厦门大学附属中山医院");
                                    String doasgeTime=null != jsonObjectBody.get("DISP_DATE") ? jsonObjectBody.get("DISP_DATE").toString() : "";
                                    wlyyPrescriptionVO.setDosageTime(DateUtil.strToDate((doasgeTime+" 00:00:00"),DateUtil.YYYY_MM_DD_HH_MM_SS));
                                    wlyyPrescriptionVOMap.put(realOrder, wlyyPrescriptionVO);
@@ -518,7 +518,7 @@ public class EntranceService {
        String resp = "";
        String orgCode = "350211A1002";
        String orgName = "厦门市中山医院";
        String orgName = "厦门大学附属中山医院";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
@@ -867,6 +867,9 @@ public class EntranceService {
                if(StringUtils.isNotBlank(vo.getFrequency())){
                    sbs.append(" frequency=\""+vo.getFrequency()+ "\"");
                }
                if(StringUtils.isNotBlank(vo.getComm())){
                    sbs.append(" comm=\""+vo.getComm()+ "\"");
                }
                //检查检验
                /**
                 *  name;//(检查方法)',
@@ -1678,7 +1681,7 @@ public class EntranceService {
                                    doctorMappingDO.setMappingCode(doctorCode);
                                    doctorMappingDO.setMappingName(doctorName);
                                    doctorMappingDO.setOrgCode("350211A1002");
                                    doctorMappingDO.setOrgName("厦门市中山医院");
                                    doctorMappingDO.setOrgName("厦门大学附属中山医院");
                                    doctorMappingDao.save(doctorMappingDO);
                                }
                                // 用医生和机构id、部门判断数据是否存在，若不存在则保存医生机构关联关系
@@ -1687,7 +1690,7 @@ public class EntranceService {
                                if (!(null != baseDoctorHospitalDOS && baseDoctorHospitalDOS.size() > 0)) {
                                    BaseDoctorHospitalDO baseDoctorHospitalDO = new BaseDoctorHospitalDO();
                                    baseDoctorHospitalDO.setOrgCode("350211A1002");
                                    baseDoctorHospitalDO.setOrgName("厦门市中山医院");
                                    baseDoctorHospitalDO.setOrgName("厦门大学附属中山医院");
                                    baseDoctorHospitalDO.setDoctorCode(baseDoctorDO.getId());
                                    baseDoctorHospitalDO.setDeptCode(deptCode);
                                    //根据机构编码获取机构名称

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

@@ -253,6 +253,7 @@ public class RegisterService {
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            logger.info(fid+" resp:"+resp);
        }
        return ConvertUtil.convertListEnvelopInRequest(resp);
    }

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -747,7 +747,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        String sql = "select a.id,a.register_no, a.type, b.id as docId, a.doctor_name, b.idcard as docIdCard\n" +
                "     , a.dept, a.dept_name, c.name as paName, c.idcard as paId, c.sex,c.mobile,a.create_time,b.charge_type\n" +
                "     ,a.register_date, a.end_time,a.icd10,a.icd10_name,a.origin_adm_no, a.description ,d.req_fee\n" +
                "     ,a.register_date, a.end_time,a.icd10,a.icd10_name,a.origin_adm_no,a.card_no, a.description ,d.req_fee\n" +
                "  from wlyy_outpatient a \n" +
                "         join base_doctor b on b.id = a.doctor\n" +
                "         join wlyy_charge_dict d on d.charge_type = b.charge_type\n" +

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

@@ -132,6 +132,11 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
     */
    private String postCount;
    /**
     * 中药用法
     */
    private String comm;
    @Column(name = "prescription_id")
    public String getPrescriptionId() {
@@ -328,4 +333,13 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    public void setPostCount(String postCount) {
        this.postCount = postCount;
    }
    @Column(name = "comm")
    public String getComm() {
        return comm;
    }
    public void setComm(String comm) {
        this.comm = comm;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -319,6 +319,8 @@ public class BaseHospitalRequestMapping {
        public static final String getDoctorPreSign ="/getDoctorPreSign";
        public static final String getDoctorIntroduction ="/getDoctorIntroduction";
        public static final String findByDict ="/findByDict";
    }

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

@@ -110,6 +110,11 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
     */
    private String diagFive;
    /**
     * 中药用法
     */
    private String comm;
    private String parentCode;//检查检验父级节点code
//    private String code;//检查检验项目编码',
    private String name;//检查检验(检查方法)',
@@ -427,4 +432,12 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
    public String getComm() {
        return comm;
    }
    public void setComm(String comm) {
        this.comm = comm;
    }
}

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

@@ -144,6 +144,9 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    private Integer del;
    private String comm;
    public String getPrescriptionId() {
        return prescriptionId;
    }

svr/svr-internet-hospital-job/src/main/resources/system.properties

@@ -6,7 +6,7 @@ prescriptionStatus_update_job=0 */2 * * * ?
prescription_overdue_job=0 0 1 * * ?
#每天1 点触发
data_upload_job=0 0 0 * * ?
data_upload_job=0 0 2 * * ?
#data_upload_25_job=0 0 1 * * ?
#

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

@@ -742,4 +742,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                            @RequestParam(value = "doctor",required = false) String doctor)throws Exception{
        return success(prescriptionService.getDoctorIntroduction(doctor));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findByDict)
    @ApiOperation(value = "查询医院字典", notes = "查询医院字典")
    public ListEnvelop findByDict(@ApiParam(name = "name", value = "字典名称")
                                  @RequestParam(value = "name", required = true)String name,
                                  @ApiParam(name = "hospital", value = "医生code")
                                  @RequestParam(value = "hospital", required = true)String hospital) {
        return success(prescriptionService.findByDict(name,hospital));
    }
}