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

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

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

@@ -0,0 +1,15 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyHospitalWorkRuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2020/3/24.
 */
public interface WlyyHospitalWorkRuleDao extends PagingAndSortingRepository<WlyyHospitalWorkRuleDO, String>, JpaSpecificationExecutor<WlyyHospitalWorkRuleDO> {
    List<WlyyHospitalWorkRuleDO> findByHospital(String hospital);
}

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

@@ -0,0 +1,71 @@
package com.yihu.jw.hospital.prescription.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.hospital.prescription.WlyyHospitalWorkRuleDO;
import com.yihu.jw.hospital.prescription.dao.WlyyHospitalWorkRuleDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * Created by Trick on 2020/3/24.
 */
@Service
@Transactional
public class WorkTimeService {
    private static final Logger logger = LoggerFactory.getLogger(WorkTimeService.class);
    @Autowired
    private WlyyHospitalWorkRuleDao wlyyHospitalWorkRuleDao;
    @Autowired
    private ObjectMapper objectMapper;
    /**
     * 保存排班规则
     * @param workTimeRuleJson
     * @return
     * @throws Exception
     */
    public WlyyHospitalWorkRuleDO saveWorkTimeRule(String workTimeRuleJson)throws Exception{
        WlyyHospitalWorkRuleDO ruleDO = objectMapper.readValue(workTimeRuleJson,WlyyHospitalWorkRuleDO.class);
        List<WlyyHospitalWorkRuleDO> orgRules = wlyyHospitalWorkRuleDao.findByHospital(ruleDO.getHospital());
        if(orgRules!=null&&orgRules.size()>0){
            wlyyHospitalWorkRuleDao.delete(orgRules);
        }
        wlyyHospitalWorkRuleDao.save(ruleDO);
        return ruleDO;
    }
    /**
     * 获取医院排班规则
     * @param hospital
     * @return
     */
    public WlyyHospitalWorkRuleDO findWorkTimeRule(String hospital){
        List<WlyyHospitalWorkRuleDO> orgRules = wlyyHospitalWorkRuleDao.findByHospital(hospital);
        return orgRules.get(0);
    }
//    public static void main(String ag[]){
//
//        Date start = DateUtil.stringToDate("2020-03-24 08:00:00","yyyy-MM-dd HH:mm:ss");
//
//        Date end = DateUtil.stringToDate("2020-03-24 12:00:00","yyyy-MM-dd HH:mm:ss");
//
//        Long total =end.getTime()-start.getTime();
//
//        Long jg = total/100;
//
//        start.setTime(start.getTime()+jg);
//
//        System.out.println(DateUtil.dateToStr(start,"yyyy-MM-dd HH:mm:ss"));
//    }
}

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

@@ -1319,8 +1319,8 @@ public class EntranceService {
//        Object errorCode = ((net.sf.json.JSONObject) json).get("error_code");
        //由于新建档的居民没有银医通，数据没办法同步。调用接口，暂时不判断返回结果，由诊间支付统一推送消息让居民支付
        JSON json2 = xmlSerializer.read(((net.sf.json.JSONObject) json).get("response").toString());
        System.out.println("银医通下载response:" + json2.toString(1));
//        JSON json2 = xmlSerializer.read(((net.sf.json.JSONObject) json).get("response").toString());
//        System.out.println("银医通下载response:" + json2.toString(1));
        jsonObject.element("code", "1");
        jsonObject.element("obj", json);
//        if ("ok".equals(errorCode)) {

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

@@ -1,8 +1,11 @@
package com.yihu.jw.hospital.prescription.service.entrance;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.utils.WebserviceUtil;
import net.sf.json.xml.XMLSerializer;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,8 +67,532 @@ public class XzzxEntranceService {
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("getDeptInfo params:"+params.toString());
        return getXzzxWebServiceInfo("CallInterface",params);
        String xml = getXzzxWebServiceInfo("CallInterface",params);
        return "";
    }
    public static void main(String ag[]){
        String xml ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>" +
                "    <returnContents>" +
                "        <returnContent>" +
                "            <code>20100</code>" +
                "            <name>后勤部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>20200</code>" +
                "            <name>消毒中转站</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>30100</code>" +
                "            <name>心内科门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>30200</code>" +
                "            <name>心外科门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>30300</code>" +
                "            <name>客户服务部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>30400</code>" +
                "            <name>超声科门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>3140000</code>" +
                "            <name>计算机中心</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>31500</code>" +
                "            <name>人事部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>31600</code>" +
                "            <name>护理部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>31700</code>" +
                "            <name>医保办</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>31800</code>" +
                "            <name>财务科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>3180001</code>" +
                "            <name>门诊收费处</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>3180002</code>" +
                "            <name>住院收费处</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>31900</code>" +
                "            <name>医务科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32000</code>" +
                "            <name>院长室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32100</code>" +
                "            <name>中心办公室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32200</code>" +
                "            <name>院感科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32300</code>" +
                "            <name>保障保卫部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32400</code>" +
                "            <name>全院</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32500</code>" +
                "            <name>综合办公室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>32600</code>" +
                "            <name>科教部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4010001</code>" +
                "            <name>心内一区</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4010002</code>" +
                "            <name>心内二区</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4010003</code>" +
                "            <name>CCU</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4010004</code>" +
                "            <name>心内三区</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4010005</code>" +
                "            <name>心内四区</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4010006</code>" +
                "            <name>特需病区</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40200</code>" +
                "            <name>心内三区病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4020001</code>" +
                "            <name>心外病区</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4020002</code>" +
                "            <name>ICU</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40300</code>" +
                "            <name>心外手术室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4030001</code>" +
                "            <name>小儿心脏科/综合科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40400</code>" +
                "            <name>心内导管室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>4040001</code>" +
                "            <name>急诊科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40500</code>" +
                "            <name>CCU病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40600</code>" +
                "            <name>ICU病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40700</code>" +
                "            <name>心内一区病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40800</code>" +
                "            <name>心内二区病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>40900</code>" +
                "            <name>心外病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41000</code>" +
                "            <name>胸痛中心</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41100</code>" +
                "            <name>起搏器门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41200</code>" +
                "            <name>麻醉科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41300</code>" +
                "            <name>急诊门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41400</code>" +
                "            <name>心内四区病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41500</code>" +
                "            <name>小儿心脏科/综合科病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41600</code>" +
                "            <name>急诊科病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41700</code>" +
                "            <name>心脏康复门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41800</code>" +
                "            <name>先天性心脏病门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>41900</code>" +
                "            <name>心衰专病门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>42000</code>" +
                "            <name>特需病房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>42100</code>" +
                "            <name>体检门诊</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>50100</code>" +
                "            <name>药房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>50200</code>" +
                "            <name>药库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>50300</code>" +
                "            <name>静配药房</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60100</code>" +
                "            <name>影像科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60200</code>" +
                "            <name>检验科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60300</code>" +
                "            <name>心脏彩超室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60400</code>" +
                "            <name>心功能室(心脏中心）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60500</code>" +
                "            <name>输血科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60600</code>" +
                "            <name>内窥镜室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60700</code>" +
                "            <name>肺功能室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60800</code>" +
                "            <name>血透室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>60900</code>" +
                "            <name>检验科（总院）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61000</code>" +
                "            <name>高压氧室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61100</code>" +
                "            <name>脑电图室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61200</code>" +
                "            <name>核医学科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61300</code>" +
                "            <name>放射科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61400</code>" +
                "            <name>CT室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61500</code>" +
                "            <name>核磁共振科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61600</code>" +
                "            <name>病理科</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61700</code>" +
                "            <name>心功能室（总院）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61800</code>" +
                "            <name>B超室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>61900</code>" +
                "            <name>药学部（总院）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62000</code>" +
                "            <name>急诊ICU（总院）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62100</code>" +
                "            <name>中心ICU（总院）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62200</code>" +
                "            <name>心电图室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62300</code>" +
                "            <name>心脏彩超室（心脏中心）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62400</code>" +
                "            <name>检验部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62500</code>" +
                "            <name>体检部</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62600</code>" +
                "            <name>心功能室（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62700</code>" +
                "            <name>心脏彩超室（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62800</code>" +
                "            <name>输血科（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>62900</code>" +
                "            <name>院外诊疗</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>63000</code>" +
                "            <name>血透（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>63100</code>" +
                "            <name>放射科（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>63200</code>" +
                "            <name>运动心肺室（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>63300</code>" +
                "            <name>核医学科（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>63400</code>" +
                "            <name>CT（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>63500</code>" +
                "            <name>MR（新）</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>70100</code>" +
                "            <name>病案室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>70200</code>" +
                "            <name>离职人员</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>80100</code>" +
                "            <name>心内实验室</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>80200</code>" +
                "            <name>临床试验组</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90100</code>" +
                "            <name>设备科仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90200</code>" +
                "            <name>总务仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90300</code>" +
                "            <name>高值仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90400</code>" +
                "            <name>科研仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90500</code>" +
                "            <name>软件仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90600</code>" +
                "            <name>五金仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90700</code>" +
                "            <name>信息科仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90800</code>" +
                "            <name>报废仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "        <returnContent>" +
                "            <code>90900</code>" +
                "            <name>报损仓库</name>" +
                "            <consultDeptFlag/>" +
                "        </returnContent>" +
                "    </returnContents>" +
                "</root>";
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        JSONObject jsonObject = JSON.parseObject(json);
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/doctor/WlyyDoctorWorkTimeDO.java

@@ -29,6 +29,7 @@ public class WlyyDoctorWorkTimeDO extends UuidIdentityEntity {
    private Date endTime;//结束时间',
    private String date;//排班日期',
    private Integer timeInterval;//号源间隔
    private Integer sourceNumber;//号源数目
    private Date createTime;//创建时间',
    public String getDoctor() {
@@ -162,4 +163,12 @@ public class WlyyDoctorWorkTimeDO extends UuidIdentityEntity {
    public void setTimeInterval(Integer timeInterval) {
        this.timeInterval = timeInterval;
    }
    public Integer getSourceNumber() {
        return sourceNumber;
    }
    public void setSourceNumber(Integer sourceNumber) {
        this.sourceNumber = sourceNumber;
    }
}

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

@@ -0,0 +1,141 @@
package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2020/3/24.
 */
@Entity
@Table(name = "wlyy_hospital_work_rule")
public class WlyyHospitalWorkRuleDO extends UuidIdentityEntity {
    private String hospital;//医院编码',
    private String openVideo;//1.开放视频预约 ; 0，不开放视频预约',
    private String onlyDuty;//1.仅在班时接受问诊 ; 0 随时可以接受问诊',
    private Integer maxDay;//开放几天号源天数',
    private String maxDayOpenTime;//最后一天号源开放时间',
    private String swStartTime;//上午开始时间',
    private String swEndTime;//上午结束时间',
    private Integer swSourceNum;//上午号源数目',
    private String xwStartTime;//下午开始时间',
    private String xwEndTime;//下午结束时间',
    private Integer xwSourceNum;//下午数目',
    private String wsStartTime;//晚上开始时间',
    private String wsEndTime;//网上结束时间',
    private Integer wsSourceNum;//晚上号源数',
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getOpenVideo() {
        return openVideo;
    }
    public void setOpenVideo(String openVideo) {
        this.openVideo = openVideo;
    }
    public String getOnlyDuty() {
        return onlyDuty;
    }
    public void setOnlyDuty(String onlyDuty) {
        this.onlyDuty = onlyDuty;
    }
    public Integer getMaxDay() {
        return maxDay;
    }
    public void setMaxDay(Integer maxDay) {
        this.maxDay = maxDay;
    }
    public String getMaxDayOpenTime() {
        return maxDayOpenTime;
    }
    public void setMaxDayOpenTime(String maxDayOpenTime) {
        this.maxDayOpenTime = maxDayOpenTime;
    }
    public String getSwStartTime() {
        return swStartTime;
    }
    public void setSwStartTime(String swStartTime) {
        this.swStartTime = swStartTime;
    }
    public String getSwEndTime() {
        return swEndTime;
    }
    public void setSwEndTime(String swEndTime) {
        this.swEndTime = swEndTime;
    }
    public Integer getSwSourceNum() {
        return swSourceNum;
    }
    public void setSwSourceNum(Integer swSourceNum) {
        this.swSourceNum = swSourceNum;
    }
    public String getXwStartTime() {
        return xwStartTime;
    }
    public void setXwStartTime(String xwStartTime) {
        this.xwStartTime = xwStartTime;
    }
    public String getXwEndTime() {
        return xwEndTime;
    }
    public void setXwEndTime(String xwEndTime) {
        this.xwEndTime = xwEndTime;
    }
    public Integer getXwSourceNum() {
        return xwSourceNum;
    }
    public void setXwSourceNum(Integer xwSourceNum) {
        this.xwSourceNum = xwSourceNum;
    }
    public String getWsStartTime() {
        return wsStartTime;
    }
    public void setWsStartTime(String wsStartTime) {
        this.wsStartTime = wsStartTime;
    }
    public String getWsEndTime() {
        return wsEndTime;
    }
    public void setWsEndTime(String wsEndTime) {
        this.wsEndTime = wsEndTime;
    }
    public Integer getWsSourceNum() {
        return wsSourceNum;
    }
    public void setWsSourceNum(Integer wsSourceNum) {
        this.wsSourceNum = wsSourceNum;
    }
}

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

@@ -359,6 +359,9 @@ public class BaseHospitalRequestMapping {
        public static final String findDeptWithDoctorWorkTime = "/findDeptWithDoctorWorkTime";
        public static final String findWorkTimeRule = "/findWorkTimeRule";
        public static final String saveWorkTimeRule = "/saveWorkTimeRule";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/doctor/WlyyDoctorWorkTimeVO.java

@@ -43,6 +43,8 @@ public class WlyyDoctorWorkTimeVO {
    private String date;//排班日期',
    @ApiModelProperty(value = "号源间隔", example = "模块1")
    private Integer timeInterval;//号源间隔
    @ApiModelProperty(value = "号源数目", example = "模块1")
    private Integer sourceNumber;//号源间隔
    @ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;//创建时间',
    @ApiModelProperty(value = "当前号源数目", example = "模块1")
@@ -191,4 +193,12 @@ public class WlyyDoctorWorkTimeVO {
    public void setCount(Integer count) {
        this.count = count;
    }
    public Integer getSourceNumber() {
        return sourceNumber;
    }
    public void setSourceNumber(Integer sourceNumber) {
        this.sourceNumber = sourceNumber;
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/service/TEST.java

@@ -1,16 +1,18 @@
//package com.yihu.jw.security.service;
//
//import com.alibaba.fastjson.JSONObject;
//import com.yihu.jw.security.utils.RSAEncrypt;
//
//import java.net.URLDecoder;
//import java.net.URLEncoder;
//
///**
// * Created by Trick on 2020/3/19.
// */
//public class TEST {
//
package com.yihu.jw.security.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.security.utils.DateUtil;
import com.yihu.jw.security.utils.RSAEncrypt;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Date;
/**
 * Created by Trick on 2020/3/19.
 */
public class TEST {
//    public static void main(String ag[])throws Exception{
//
//        String key ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCBW5nRkb1RsLGd47rjrI33X0ZHssXV5qjH/S/18SmAHf2ek61bv+Ht23J1FUNcmda7iQesS8Uqn+WoC/jK/ecicp7jKRdGIIyMX+GIEJVlLJHXVZJnJO0QqU+l9BBk1xJBODXBvnDIwN8DmLsXrMBhDbVgPmHi8Vn+PsC0F6llBQIDAQAB";
@@ -42,4 +44,9 @@
//        String str = RSAEncrypt.decrypt(decode,privateKey);
//        System.out.println("decrypt : "+str);
//    }
//}
//    public static void main(String ag[]){
//        System.out.println(DateUtil.dateToStr(new Date(),"yyyy-MM"));
//    }
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

@@ -1,7 +1,30 @@
package com.yihu.jw.entrance.controller;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by Trick on 2020/3/18.
 */
public class XzzxCotroller {
@RestController
@RequestMapping(value ="/xzzx")
@Api(value = "心脏中心平台服务", description = "心脏中心平台服务", tags = {"心脏中心平台服务"})
public class XzzxCotroller extends EnvelopRestEndpoint {
    @Autowired
    private XzzxEntranceService xzzxEntranceService;
    @GetMapping(value = "/getDeptInfo")
    @ApiOperation(value = "获取部门信息", notes = "获取部门信息")
    public ObjEnvelop getDeptInfo()throws Exception{
        return ObjEnvelop.getSuccess("ok",xzzxEntranceService.getDeptInfo());
    }
}

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

@@ -183,4 +183,36 @@ fastDFS:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://www.xmtyw.cn/wlyytest/
---
#心脏中心前置机配置
spring:
  profiles: xzprod_in
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://192.168.103.155:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: jkzl
    password: jkzl@2020
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false
hospital:
  url: https://172.16.1.34
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.16.1.42:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://192.168.103.159:8888/
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置

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

@@ -8,6 +8,7 @@ import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.InspectionService;
import com.yihu.jw.hospital.prescription.service.PrescriptionLogService;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.hospital.prescription.service.WorkTimeService;
import com.yihu.jw.hospital.prescription.service.entrance.DoctorPreSignService;
import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
import com.yihu.jw.im.service.ImService;
@@ -31,6 +32,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import oracle.jdbc.proxy.annotation.Post;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -66,6 +68,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    
    @Autowired
    private HospitalSystemMessageService hospitalSystemMessageService;
    @Autowired
    private WorkTimeService workTimeService;
    
    @Autowired
    private ImService imService;
@@ -997,4 +1002,18 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                                  @RequestParam(value = "pagesize",required = false)Integer pagesize) {
        return success(prescriptionService.findDeptWithDoctorWorkTime(hospital,keyWord,page,pagesize));
    }
    @PostMapping(value= BaseHospitalRequestMapping.Prescription.findWorkTimeRule)
    @ApiOperation(value = "查询排班规则")
    public ObjEnvelop findWorkTimeRule(@ApiParam(name = "hospital", value = "医院code")
                                       @RequestParam(value = "hospital",required = false)String hospital) {
        return success(workTimeService.findWorkTimeRule(hospital));
    }
    @PostMapping(value= BaseHospitalRequestMapping.Prescription.saveWorkTimeRule)
    @ApiOperation(value = "保存排班规则")
    public ObjEnvelop saveWorkTimeRule(@ApiParam(name = "workTimeRuleJson", value = "保存排班规则")
                                       @RequestParam(value = "workTimeRuleJson",required = false)String workTimeRuleJson) throws Exception{
        return success(workTimeService.saveWorkTimeRule(workTimeRuleJson));
    }
}