预约挂号

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

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 {
@@ -1678,7 +1678,7 @@ public class EntranceService {
                                    doctorMappingDO.setMappingCode(doctorCode);
                                    doctorMappingDO.setMappingName(doctorName);
                                    doctorMappingDO.setOrgCode("350211A1002");
                                    doctorMappingDO.setOrgName("厦门市中山医院");
                                    doctorMappingDO.setOrgName("厦门大学附属中山医院");
                                    doctorMappingDao.save(doctorMappingDO);
                                }
                                // 用医生和机构id、部门判断数据是否存在，若不存在则保存医生机构关联关系
@@ -1687,7 +1687,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/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" +

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 * * ?
#