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

business/base-service/src/main/java/com/yihu/jw/article/service/KnowledgeArticleDictService.java

@@ -164,9 +164,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            // 新增
            knowledgeArticleDO.setId(UUID.randomUUID().toString().replace("-", ""));
            knowledgeArticleDO.setCreateTime(new Date());
            knowledgeArticleDO.setStatus(0);
            knowledgeArticleDO.setReleaseStatus(0);
            knowledgeArticleDO.setDel(1);
            knowledgeArticleDO.setType(type);
@@ -178,7 +176,6 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            if (knowledgeArticleDO.getReleaseTime() == null) {
                knowledgeArticleDO.setReleaseTime(new Date());
            }
            if (type == 1) {
                BaseDoctorDO userDO = doctorDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);
                if (userDO != null) {
@@ -190,13 +187,10 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
                    knowledgeArticleDO.setCreateUserName(userDO.getName());
                }
            }
            if (!articleNeedCheck) {
                knowledgeArticleDO.setStatus(1);
                knowledgeArticleDO.setReleaseStatus(1);
            }
            knowledgeArticleDO = knowledgeArticleDictDao.save(knowledgeArticleDO);
            return knowledgeArticleDO;
        } else {
@@ -223,6 +217,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            one.setVedioUrl(knowledgeArticleDO.getVedioUrl());
            one.setRecommendDoctor(knowledgeArticleDO.getRecommendDoctor());
            one.setRecommendDoctorName(knowledgeArticleDO.getRecommendDoctorName());
            if (!articleNeedCheck) {
                one.setStatus(1);
                one.setReleaseStatus(1);

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

@@ -1274,16 +1274,16 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
    public JSONArray selectHistoryEmrFromEntrance(String patientId,String eventNo) throws Exception {
       JSONArray array =dsyyEntranceService.selectHistoryEmrFromEntrance(patientId,eventNo);
       JSONArray jsonArray = new JSONArray();
       for (int i=0;i<array.size();i++){
           JSONObject object = array.getJSONObject(i);
           String PATIENT = object.getString("PATIENT");
           String OPID = object.getString("OPID");
           String res = selectHistoryEmrRecord(PATIENT,OPID);
           if (StringUtils.isNoneBlank(res)&&!res.equalsIgnoreCase("[]")){
               jsonArray.add(object);
           }
       }
       return jsonArray;
//       for (int i=0;i<array.size();i++){
//           JSONObject object = array.getJSONObject(i);
//           String PATIENT = object.getString("PATIENT");
//           String OPID = object.getString("OPID");
//           String res = selectHistoryEmrRecord(PATIENT,OPID);
//           if (StringUtils.isNoneBlank(res)&&!res.equalsIgnoreCase("[]")){
//               jsonArray.add(object);
//           }
//       }
       return array;
    }

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

@@ -47,6 +47,7 @@ import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import com.yihu.jw.entity.hospital.doctor.WlyyDoctorOnlineTimeDO;
import com.yihu.jw.entity.hospital.doctor.WlyyDoctorWorkTimeDO;
import com.yihu.jw.entity.hospital.doctor.WlyyPatientRegisterTimeDO;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalMxDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
@@ -69,6 +70,7 @@ import com.yihu.jw.hospital.doctor.dao.DoctorWorkTimeDao;
import com.yihu.jw.hospital.doctor.dao.PatientRegisterTimeDao;
import com.yihu.jw.hospital.doctor.dao.WlyyDoctorOnlineTimeDao;
import com.yihu.jw.hospital.drugstore.dao.BaseDrugStoreDao;
import com.yihu.jw.hospital.family.dao.WlyyPatientFamilyMemberDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailMxDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailRelationDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
@@ -372,7 +374,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    private HealthCareNewService healthCareNewService;
    @Autowired
    private BasePatientAddressInfoDao addressInfoDao;
    @Autowired
    private WlyyPatientFamilyMemberDao familyMemberDao;
    //已就诊医生列表
    public PageEnvelop visitedDoctorPage(String patientId,String startTime,String endTime,Integer page,Integer size){
        String sql = "SELECT d.id,d.name,d.job_title_name jobTitleName,o.dept_name deptName,d.photo,date_format(MAX(o.create_time),'%Y-%m-%d %H:%i:%S' )" +
@@ -5086,6 +5089,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "WHERE t.id = '"+doctorDO.getId()+"'";
            chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            rs.put("chargeTypeList",chargeDictDOLists);
            DoctorMappingDO mappingDO = doctorMappingDao.findByDoctor(doctorDO.getId());
            rs.put("doctorMappingDO",mappingDO);
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
            List<BaseDoctorHospitalDO> hospitalDOList = new ArrayList<>();
@@ -16072,4 +16077,50 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return object;
    }
    public void initPatientAfter() throws Exception {
        String sql = "select * from base_patient_temp ";
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:maps){
            String idcard =map.get("idcard").toString();
            String name = map.get("name").toString();
            String mobile = map.get("mobile")==null?null:map.get("mobile").toString();
            BasePatientDO patientDO =  basePatientDao.findByIdcardAndDel(idcard,"1");
            if(StringUtils.isNotBlank(idcard)&&patientDO == null){
                BasePatientDO patient = new BasePatientDO();
                String salt = UUID.randomUUID().toString().substring(0,5);
                String pw = null;
                pw = idcard.substring(idcard.length()-6);
                patient.setIdcard(idcard);
                patient.setName(name);
                patient.setMobile(mobile);
                patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
                patient.setSalt(salt);
                patient.setDel("1");
                patient.setEnabled(1);
                patient.setLocked(0);
                patient.setSex(Integer.parseInt(com.yihu.jw.util.idcard.IdCardUtil.getSexForIdcard_new(idcard)));
                patient.setCreateTime(new Date());
                patient.setUpdateTime(new Date());
                patient.setBirthday(DateUtil.strToDate(com.yihu.jw.util.idcard.IdCardUtil.getBirthdayForIdcardStr(idcard),"yyyyMMdd"));
                patientDO = basePatientDao.save(patient);
                WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(patientDO.getId(),"7");
                if (basePatientFamilyMemberDO==null){
                    basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                    basePatientFamilyMemberDO.setPatient(patientDO.getId());
                    basePatientFamilyMemberDO.setFamilyRelation("7");
                    basePatientFamilyMemberDO.setFamilyRelationName("自己");
                    basePatientFamilyMemberDO.setCardType("身份证");
                    basePatientFamilyMemberDO.setCardNo(patientDO.getIdcard());
                    basePatientFamilyMemberDO.setCreateTime(new Date());
                    basePatientFamilyMemberDO.setUpdateTime(new Date());
                    basePatientFamilyMemberDO.setIsAuthorize(1);
                    basePatientFamilyMemberDO.setIsDel(1);
                    basePatientFamilyMemberDO.setFamilyMember(patientDO.getId());
                    familyMemberDao.save(basePatientFamilyMemberDO);
                }
            }
        }
    }
}

server/svr-authentication/src/main/resources/application.yml

@@ -83,7 +83,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -116,7 +116,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -161,7 +161,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -194,7 +194,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -227,7 +227,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -253,13 +253,13 @@ spring:
  ##发现服务
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.0.33.26:22122
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -286,13 +286,13 @@ spring:
  ##发现服务
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://172.16.100.240:22122
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 2
@@ -319,13 +319,13 @@ spring:
  ##发现服务
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.168.103.159:22122
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 1
@@ -356,7 +356,7 @@ iHealth:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -420,7 +420,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -448,13 +448,13 @@ spring:
  ##发现服务
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://10.9.1.247:22122
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -515,13 +515,13 @@ spring:
    password: Kb6wKDQP1W4
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://127.0.0.1:22122
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
testPattern:
  sign: 0
@@ -552,7 +552,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
@@ -583,7 +583,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://192.168.101.2:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
@@ -609,13 +609,13 @@ spring:
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.168.120.103:6002
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
@@ -642,13 +642,13 @@ spring:
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
  user-info-uri: http://ijk.xmsmjk.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.168.120.103:6002
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
@@ -682,7 +682,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.222:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -716,7 +716,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.222:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
testPattern:
  sign: 1
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
@@ -748,7 +748,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -783,7 +783,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -819,7 +819,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -860,7 +860,7 @@ zhongshanHospital:
fastDFS:
  fastdfs_file_url: http://192.0.25.33:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0

svr/svr-base/src/main/resources/application.yml

@@ -433,7 +433,7 @@ hospital:
  SourceSysCode: S60
  TargetSysCode: S01
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://ijk.xmsmjk.com/wlyy/
wechat:
  id: xm_ykyy_wx
#文件服务器上传配置 0本地，1.I健康,2.内网调用
@@ -472,7 +472,7 @@ spring:
fast-dfs:
  tracker-server: 10.90.32.3:20003 #服务器地址
fastDFS:
  fastdfs_file_url: https://www.xmtyw.cn/
  fastdfs_file_url: https://ijk.xmsmjk.com/
demo:
  flag: true
hospital:
@@ -482,7 +482,7 @@ hospital:
  SourceSysCode: S60
  TargetSysCode: S01
wlyy:
  url: https://www.xmtyw.cn/wlyy/
  url: https://ijk.xmsmjk.com/wlyy/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040
  flag: false
@@ -525,7 +525,7 @@ spring:
fast-dfs:
  tracker-server: 10.90.32.3:20003 #服务器地址
fastDFS:
  fastdfs_file_url: http://www.xmtyw.cn/
  fastdfs_file_url: http://ijk.xmsmjk.com/
demo:
  flag: true
hospital:
@@ -900,7 +900,7 @@ hospital:
pay:
  flag: false
wlyy:
  url: https://www.xmtyw.cn/wlyy/
  url: https://ijk.xmsmjk.com/wlyy/
wechat:
  id: xm_hcyy_wx
  url: https://zhyzh.gongshu.gov.cn/

svr/svr-door-service/src/main/resources/application.yml

@@ -246,7 +246,7 @@ wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fwlyy
  wechat_base_url: http%3a%2f%2fijk.xmsmjk.com%2fwlyy
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  flag: true #演示环境  true走Mysql数据库  false走Oracle

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

@@ -66,7 +66,7 @@ FileTempPath:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
swagger:
  basic:
    enable: true
@@ -103,7 +103,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
express:
@@ -144,7 +144,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -184,7 +184,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_zsyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -234,7 +234,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -284,7 +284,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -334,7 +334,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -377,7 +377,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -422,7 +422,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -467,7 +467,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段  # todo 待配置
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -519,7 +519,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -569,7 +569,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -612,7 +612,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -655,7 +655,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -704,7 +704,7 @@ fast-dfs:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_qsyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle

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

@@ -129,7 +129,7 @@ im:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_mlwyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -176,7 +176,7 @@ im:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -220,7 +220,7 @@ im:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  ids: xm_ykyy_wx
@@ -259,7 +259,7 @@ im:
fastDFS:
  fastdfs_file_url: http://192.0.33.26:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -301,7 +301,7 @@ im:
fastDFS:
  fastdfs_file_url: http://172.16.100.240:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -342,7 +342,7 @@ im:
fastDFS:
  fastdfs_file_url: http://192.168.103.159:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -382,7 +382,7 @@ im:
fastDFS:
  fastdfs_file_url: http://10.9.1.247:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -424,7 +424,7 @@ im:
fastDFS:
  fastdfs_file_url: http://192.168.120.103:6004/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -462,7 +462,7 @@ im:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -501,7 +501,7 @@ im:
fastDFS:
  fastdfs_file_url: http://10.172.0.61:8888/
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -541,7 +541,7 @@ im:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -581,7 +581,7 @@ im:
fastDFS:
  fastdfs_file_url: http://127.0.0.1:8888/
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -621,7 +621,7 @@ im:
fastDFS:
  fastdfs_file_url: http://192.168.101.2:8888/
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_dsyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
@@ -666,7 +666,7 @@ im:
fastDFS:
  fastdfs_file_url: http://192.0.25.33:8888/
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmsmjk.com/wlyytest/
wechat:
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/base/BaseInfoEndpoint.java

@@ -70,11 +70,7 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
    public Envelop getCity() throws Exception {
        try {
            List<BaseCityDO> res =  cityService.getAllCity();
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取市列表信息！");
            }
            return  success(res);
        }catch (Exception e){
            return failedException(e);
        }
@@ -94,11 +90,8 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
        try {
            List<BaseOrgDO> res =  baseOrgInfoService.getOrgByCity(cityCode,level);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("该市未维护医院信息！");
            }
            return  success(res);
        }catch (Exception e){
            return failedException(e);
        }
@@ -121,11 +114,8 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
        try {
            List<DictHospitalDeptDO> res =  hospitalDeptService.getHosDeptByCode(orgCode,consultDeptFlag,name);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构的部门列表信息！");
            }
            return  success(res);
        }catch (Exception e){
            return failedException(e);
        }
@@ -146,11 +136,8 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
        try {
            List<BaseDoctorHospitalDO> res =  baseDoctorHosService.getDoctorByOrgAndDept(orgCode,deptCode);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构科室下的医生信息！");
            }
            return  success(res);
        }catch (Exception e){
            return failedException(e);
        }
@@ -168,11 +155,8 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
        try {
            List<DictJobTitleDO> res= baseDictJobTitleService.getBySaasId(saasId);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构的职称信息！");
            }
            return  success(res);
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -479,11 +479,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "consultDeptFlag", required = false) String consultDeptFlag)  {
        try {
            List<DictHospitalDeptDO> res =  hospitalDeptService.getHosDeptByCode(orgCode,consultDeptFlag,name);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构的部门列表信息！");
            }
            return  success(res);
        }catch (Exception e){
            return  failedException2(e);
        }
@@ -500,11 +496,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "saasId", required = false) String saasId)  {
        try {
            List<DictJobTitleDO> res= baseDictJobTitleService.getBySaasId(saasId);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构的职称信息！");
            }
            return  success(res);
        }catch (Exception e){
            return  failedException2(e);
        }

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

@@ -3984,5 +3984,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success("操作成功", dsyyPrescriptionService.getPersonInfoByCode(ehealthCode));
    }
    @GetMapping("/initPatientAfter")
    @ApiOperation(value = "初始化诊后患者数据", notes = "初始化诊后患者数据")
    public Envelop initPatientAfter() throws Exception {
        prescriptionService.initPatientAfter();
        return success("操作成功");
    }
}

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

@@ -332,7 +332,7 @@ testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
@@ -769,7 +769,7 @@ testPattern:
  sign: 1
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
es:
  pwflag: 0 # 1需要密码，0不需要密码
  index:
@@ -960,7 +960,7 @@ testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
@@ -1198,7 +1198,7 @@ testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
@@ -1281,7 +1281,7 @@ testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy

svr/svr-manage/src/main/java/com/yihu/customer/util/SystemConf.java

@@ -208,7 +208,7 @@ public class SystemConf {
	public String getServerUrlStr() {
		String temp = getSystemProperties().getProperty(SERVER_URL);
		if (StringUtils.isEmpty(temp)) {
			temp = "https://www.xmtyw.cn/wlyy/";
			temp = "https://ijk.xmsmjk.com/wlyy/";
		}
		return temp;
	}

svr/svr-manage/src/main/resources/application.yml

@@ -349,7 +349,7 @@ im-service:
yueren:
  api: http://120.77.209.211:8080
doctorAssistant:
  api: https://www.xmtyw.cn/assistant
  api: https://ijk.xmsmjk.com/assistant
  target_url: home/html/unreadMessageStatistic.html
wlyyService:
  api: https://ehr.yihu.com/wlyy/
@@ -481,35 +481,35 @@ im-service:
yueren:
  api: http://120.77.209.211:8080
doctorAssistant:
  api: https://www.xmtyw.cn/assistant
  api: https://ijk.xmsmjk.com/assistant
  target_url: home/html/unreadMessageStatistic.html
wlyyService:
  api: https://www.xmtyw.cn/wlyy/
  api: https://ijk.xmsmjk.com/wlyy/
image:
  imgUrlDomain: https://www.xmtyw.cn/
  imgUrlDomain: https://ijk.xmsmjk.com/
sign:
  check_upload: http://59.61.92.90:8087/wlyy_service
  #check_upload: http://59.61.92.90:8072/wlyy_service
server:
  server_url: https://www.xmtyw.cn/wlyy/
  server_url: https://ijk.xmsmjk.com/wlyy/
#智业预约记录接口
reservation:
  zyurl: http://59.61.92.90:8072/wlyy_service
#健康活动url
healthbank:
  url: https://www.xmtyw.cn/svr-wlyy-health-bank/svr-health-bank/
  url: https://ijk.xmsmjk.com/svr-wlyy-health-bank/svr-health-bank/
#i健康1.0接口
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmsmjk.com/wlyytest/
#集美宣教居民端健康文章
jkEdu:
  web:
    articleBaseUrl: http://www.xmtyw.cn/
    articleBaseUrl: http://ijk.xmsmjk.com/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fwlyy
  wechat_base_url: http%3a%2f%2fijk.xmsmjk.com%2fwlyy
  accId: gh_ffd64560fb21
  message:
   ##医生追加建议提醒 --签约邀请
@@ -579,7 +579,7 @@ putMesType:
  #推送到redis消息类型
  wechat: wechat
fastDFS:
  fastdfs_file_url: https://www.xmtyw.cn/
  fastdfs_file_url: https://ijk.xmsmjk.com/
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276

svr/svr-visit-behind/src/main/resources/application.yml

@@ -326,7 +326,7 @@ testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
@@ -763,7 +763,7 @@ testPattern:
  sign: 1
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
es:
  pwflag: 0 # 1需要密码，0不需要密码
  index:
@@ -954,7 +954,7 @@ testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
@@ -1115,7 +1115,7 @@ testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
@@ -1198,7 +1198,7 @@ testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ijk.xmsmjk.com/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy