Browse Source

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

yeshijie 4 years ago
parent
commit
ba85d13f6d
100 changed files with 840 additions and 15 deletions
  1. 65 0
      business/base-service/src/main/java/com/yihu/jw/dict/service/HospitalParameterService.java
  2. 8 0
      business/base-service/src/main/java/com/yihu/jw/hospital/dict/BaseHospitalParameterDao.java
  3. 14 0
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/BaseNationalDrugDictDao.java
  4. 85 0
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/NationalDrugDictService.java
  5. 5 9
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java
  6. 1 0
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java
  7. 85 0
      common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseHospitalParameterDO.java
  8. 429 0
      common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/BaseNationalDrugDictDO.java
  9. 8 0
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java
  10. 70 0
      common/common-util/src/main/java/com/yihu/jw/util/common/PingyinUtils.java
  11. 70 6
      server/svr-authentication/pom.xml
  12. 0 0
      svr/svr-door-service/pom.xml
  13. 0 0
      svr/svr-door-service/readme.MD
  14. 0 0
      svr/svr-door-service/sql/初始sql.sql
  15. 0 0
      svr/svr-door-service/sql/随访记录详情新增索引.txt
  16. 0 0
      svr/svr-door-service/src/main/java/com/yihu/SvrDoorServiceApplication.java
  17. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/config/jpa/DoorServiceJpa.java
  18. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/config/jpa/HibernateProperties.java
  19. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/BaseController.java
  20. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/common/DistrictController.java
  21. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/common/EntranceController.java
  22. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorConsultController.java
  23. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorController.java
  24. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorDoorServiceAuditController.java
  25. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorQuickReplyController.java
  26. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoorOrderController.java
  27. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoorStatisticAnalyzeController.java
  28. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/followup/DoctorFollowUpController.java
  29. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/followup/DoctorFollowupDrugsController.java
  30. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/ConsultController.java
  31. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/DoorCommentController.java
  32. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/PatientController.java
  33. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/PatientDoorServiceApplicationController.java
  34. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorCommentController.java
  35. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorCommentDoctorController.java
  36. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorConclusionController.java
  37. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorDoctorController.java
  38. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorDoctorFeeController.java
  39. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorFeeDetailController.java
  40. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorPatientConfirmLogController.java
  41. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorServiceOrderController.java
  42. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoctorRegistrationDao.java
  43. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoctorRegistrationTempDao.java
  44. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceApplicationDao.java
  45. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceConfigureDao.java
  46. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceOrderDao.java
  47. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceVoucherDao.java
  48. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorCancelLogDao.java
  49. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorCommentDao.java
  50. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorCommentDoctorDao.java
  51. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorConclusionDao.java
  52. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorDao.java
  53. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorFeeDictDao.java
  54. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorStatusDao.java
  55. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorFeeDetailDao.java
  56. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorOrderItemDao.java
  57. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPatientConfirmLogDao.java
  58. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDao.java
  59. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDetailDao.java
  60. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDrugDao.java
  61. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorProcessLogDao.java
  62. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorServiceOrderDao.java
  63. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorTransRecordDao.java
  64. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/common/SignFamilyDao.java
  65. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/consult/DoctorQuickReplyDao.java
  66. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/followup/FollowUpDao.java
  67. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/followup/FollowupDrugsDao.java
  68. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoctorRegistrationTempService.java
  69. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorCommentService.java
  70. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorOrderService.java
  71. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorServiceApplicationService.java
  72. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorServiceVoucherService.java
  73. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorCancelLogService.java
  74. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorCommentDoctorService.java
  75. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorCommentService.java
  76. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorConclusionService.java
  77. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorFeeDictService.java
  78. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorService.java
  79. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorStatusService.java
  80. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorFeeDetailService.java
  81. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorPatientConfirmLogService.java
  82. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorPrescriptionService.java
  83. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorProcessLogService.java
  84. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java
  85. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorTransRecordService.java
  86. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/HospitalService.java
  87. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/PatientService.java
  88. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/ServerPackageService.java
  89. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/WlyyMessageService.java
  90. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/WlyySystemDictService.java
  91. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/consult/ConsultTeamService.java
  92. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/consult/DoctorQuickReplyService.java
  93. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/followup/FollowUpService.java
  94. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/followup/FollowupDrugsService.java
  95. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/prescription/JwDoorPrescriptionService.java
  96. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/prescription/PresModeAdapter.java
  97. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/statics/DoorStatisticAnalyzeService.java
  98. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/service/statics/StatisticsUtilService.java
  99. 0 0
      svr/svr-door-service/src/main/java/com/yihu/jw/door/util/MessageUtil.java
  100. 0 0
      svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/StreamUtil.java

+ 65 - 0
business/base-service/src/main/java/com/yihu/jw/dict/service/HospitalParameterService.java

@ -0,0 +1,65 @@
package com.yihu.jw.dict.service;
import com.yihu.jw.entity.hospital.dict.BaseHospitalParameterDO;
import com.yihu.jw.hospital.dict.BaseHospitalParameterDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class HospitalParameterService extends BaseJpaService<BaseHospitalParameterDO, BaseHospitalParameterDao> {
    @Autowired
    private BaseHospitalParameterDao hospitalParameterDao;
    public BaseHospitalParameterDO createOrUpdateParameter(BaseHospitalParameterDO hospitalParameterDO) {
        //判断新增或编辑
        if (hospitalParameterDO.getId() == null) {
            hospitalParameterDO.setCreateTime(new Date());
            hospitalParameterDO.setDel(1);
            hospitalParameterDO.setUpdateTime(new Date());
            return hospitalParameterDao.save(hospitalParameterDO);
        } else {
            BaseHospitalParameterDO oldHospitalParameter = hospitalParameterDao.findOne(hospitalParameterDO.getId());
            BeanUtils.copyProperties(hospitalParameterDO, oldHospitalParameter, getNullPropertyNames(hospitalParameterDO));
            oldHospitalParameter.setUpdateTime(new Date());
            return hospitalParameterDao.save(oldHospitalParameter);
        }
    }
    public void delHospitalParameter(Integer id) {
        hospitalParameterDao.delete(id);
    }
    public MixEnvelop getHospitalParameterList(String name, String hospital, Integer del, Integer page, Integer pageSize) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        String filters = "";
        if (StringUtils.isNotBlank(name)) {
            filters += "name?" + name + ";";
        }
//        if (StringUtils.isNotBlank(number)) {
//            filters += "number?" + number + ";";
//        }
        if (StringUtils.isNotBlank(hospital)) {
            filters += "hospital=" + hospital + ";";
        }
        if (del != null) {
            filters += "del=" + del + ";";
        }
        Integer count = this.search(null, filters, null).size();
        List<BaseHospitalParameterDO> list = this.search(null, filters, null, page, pageSize);
        mixEnvelop.setMessage("获取成功!");
        mixEnvelop.setCurrPage(page);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setTotalCount(count);
        mixEnvelop.setDetailModelList(list);
        return mixEnvelop;
    }
}

+ 8 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/dict/BaseHospitalParameterDao.java

@ -0,0 +1,8 @@
package com.yihu.jw.hospital.dict;
import com.yihu.jw.entity.hospital.dict.BaseHospitalParameterDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseHospitalParameterDao extends PagingAndSortingRepository<BaseHospitalParameterDO, Integer>, JpaSpecificationExecutor<BaseHospitalParameterDO> {
}

+ 14 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/BaseNationalDrugDictDao.java

@ -0,0 +1,14 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.BaseNationalDrugDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNationalDrugDictDao extends PagingAndSortingRepository<BaseNationalDrugDictDO, Integer>, JpaSpecificationExecutor<BaseNationalDrugDictDO> {
    @Query("update BaseNationalDrugDictDO b set b.status = ?2 where b.id = ?1")
    @Modifying
    void updateStatusById(Integer id, Integer status);
}

+ 85 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/NationalDrugDictService.java

@ -0,0 +1,85 @@
package com.yihu.jw.hospital.prescription.service;
import com.yihu.jw.entity.hospital.prescription.BaseNationalDrugDictDO;
import com.yihu.jw.hospital.prescription.dao.BaseNationalDrugDictDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.common.ConvertToSpellUtils;
import com.yihu.jw.util.common.PingyinUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
@Transactional
public class NationalDrugDictService extends BaseJpaService<BaseNationalDrugDictDO, BaseNationalDrugDictDao> {
    @Autowired
    private BaseNationalDrugDictDao nationalDrugDictDao;
    public BaseNationalDrugDictDO saveNationalDrug(BaseNationalDrugDictDO nationalDrugDictDO) {
        nationalDrugDictDO.setPyName(ConvertToSpellUtils.changeToTonePinYin(nationalDrugDictDO.getName()));
        nationalDrugDictDO.setPyCommonName(ConvertToSpellUtils.changeToTonePinYin(nationalDrugDictDO.getCommonName()));
        //判断新增或编辑
        if (nationalDrugDictDO.getId() == null) {
            nationalDrugDictDO.setCreateTime(new Date());
            nationalDrugDictDO.setStatus(1);
            nationalDrugDictDO.setUpdateTime(new Date());
            return nationalDrugDictDao.save(nationalDrugDictDO);
        }else {
            BaseNationalDrugDictDO oldDurgDictDO =  nationalDrugDictDao.findOne(nationalDrugDictDO.getId());
            BeanUtils.copyProperties(nationalDrugDictDO, oldDurgDictDO, getNullPropertyNames(nationalDrugDictDO));
            oldDurgDictDO.setUpdateTime(new Date());
            return nationalDrugDictDao.save(oldDurgDictDO);
        }
    }
    /**
     * 获取药品列表
     *
     * @param name
     * @param number
     * @param hospital
     * @param status
     * @param page
     * @param pageSize
     * @return
     * @throws ParseException
     */
    public MixEnvelop getNationalDrugList(String name, String number, String hospital, Integer status, Integer page, Integer pageSize) throws ParseException {
        MixEnvelop mixEnvelop = new MixEnvelop();
        String filters = "";
        if (StringUtils.isNotBlank(name)) {
            filters += "name?" + name + ";";
        }
        if (StringUtils.isNotBlank(number)) {
            filters += "number?" + number + ";";
        }
        if (StringUtils.isNotBlank(hospital)) {
            filters += "hospital=" + hospital + ";";
        }
        if (status != null) {
            filters += "status=" + status + ";";
        }
        Integer count = this.search(null, filters, null).size();
        List<BaseNationalDrugDictDO> list = this.search(null, filters, null, page, pageSize);
        mixEnvelop.setMessage("获取成功!");
        mixEnvelop.setCurrPage(page);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setTotalCount(count);
        mixEnvelop.setDetailModelList(list);
        return mixEnvelop;
    }
    public void updateNationalDrugStatus(Integer id, Integer status) {
         nationalDrugDictDao.updateStatusById(id, status);
    }
}

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

@ -10555,9 +10555,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    com.alibaba.fastjson.JSONObject jsonObject = object.getJSONObject("MsgInfo");
                    String Msg = jsonObject.getString("Msg");
                    if (Msg.contains("Error")){
                        returnMap.put("msg",Msg);
                        returnMap.put("status","-1");
                        return  returnMap;
                            returnMap.put("msg",Msg);
                            returnMap.put("status","-1");
                            return  returnMap;
                    }else {
                        flag = true;
                    }
@ -10729,7 +10729,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else if (wechatId.equalsIgnoreCase("xm_ykyy_wx")){
            Double natFee = 8000.0;
            if(StringUtils.isNoneBlank(chargeAmount)){
                natFee= Double.parseDouble(chargeAmount);
                natFee= Double.parseDouble(chargeAmount)*100;
            }
            BaseNatAppointmentDO baseNatAppointmentDO= new BaseNatAppointmentDO();
            baseNatAppointmentDO.setMedicare(mediaCard);
@ -11126,7 +11126,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                    List<WlyyHospitalSysDictDO> natConfigList = wlyyHospitalSysDictDao.findByDictName("natConfigList");
                                    String checkPart = "鼻/咽拭子";
                                    String chargeFlag = "2";
                                    String chargeCode = "361322";
                                    String icdCode = "Z00.000";
                                    Integer winNo = 6;
                                    for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:natConfigList){
@ -11136,9 +11135,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                        if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"chargeFlag".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                                            chargeFlag = wlyyHospitalSysDictDO.getDictValue();
                                        }
                                        if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"chargeCode".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                                            chargeCode = wlyyHospitalSysDictDO.getDictValue();
                                        }
                                        if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"icdCode".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                                            icdCode = wlyyHospitalSysDictDO.getDictValue();
                                        }
@ -11152,7 +11148,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                    jsondate.put("checkPart",checkPart);
                                    jsondate.put("cardNo",baseNatAppointmentDO.getMedicare());
                                    jsondate.put("chargeFlag",chargeFlag);
                                    jsondate.put("chargeCode",chargeCode);
                                    jsondate.put("chargeCode",baseNatAppointmentDO.getChargeCode());
                                    jsondate.put("icdCode",icdCode);
                                    jsondate.put("socialNo",baseNatAppointmentDO.getCardNo());
                                    jsondate.put("tellPhone",baseNatAppointmentDO.getMobile());

+ 1 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@ -2032,6 +2032,7 @@ public class YkyyEntranceService {
        BigDecimal bigDecimal = new BigDecimal("80");
        if (StringUtils.isNoneBlank(natAppointmentDO.getChargeAmount())){
            bigDecimal= new BigDecimal(natAppointmentDO.getChargeAmount());
        }
        List<WlyyHospitalSysDictDO> natConfigList = wlyyHospitalSysDictDao.findByDictName("natConfigList");

+ 85 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseHospitalParameterDO.java

@ -0,0 +1,85 @@
package com.yihu.jw.entity.hospital.dict;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
@Table(name = "base_hospital_parameter")
@Entity
public class BaseHospitalParameterDO extends IntegerIdentityEntityWithOperator {
    private String number;//参数编码
    private String name;//参数名称
    private String value;//参数值
    private String hospital;//所属机构
    private String hospitalName;//所属机构名称
    private String description;//参数描述
    private String explain;//参数值说明
    private Integer del;//是否有效(1是 0否)
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getExplain() {
        return explain;
    }
    public void setExplain(String explain) {
        this.explain = explain;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

+ 429 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/BaseNationalDrugDictDO.java

@ -0,0 +1,429 @@
package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
@Entity
@Table(name = "base_national_drug_dict")
@SequenceGenerator(name="id_generated", sequenceName="BASE_NATIONAL_DRUG_DICT_SEQ")
public class BaseNationalDrugDictDO extends IntegerIdentityEntity {
    private String number;//国家编码
    private String name;//国家药品通用名
    private String pyName;//国家药品通用名称拼音码
    private String subjectClass;//科目类别id
    private String subjectClassName;//科目类别名称
    private String commonName;//药品通用名
    private String pyCommonName;//药品通用名称拼音码
    private String hospital;//机构id
    private String hospitalName;//机构名称
    private String relationCode;//国家药品编码saasId(机构药品时该字段才有值)
    private String gyzz;//国药准字
    private String unit;//包装单位
    private String packingSpecifications;//包装规格
    private Integer isSplit;//是否可拆(1是 0否)
    private String drugSpecifications;//药品规格
    private String dosageForm;//剂型
    private String drugCode;//药品类别
    private String drugName;//药品类别名称
    private String minDose;//最小剂量
    private String doseUnit;//剂量单位
    private String doseUnitName;//剂量单位名称
    private String manageClass;//管理类别id
    private BigDecimal retailPrice;//零售价格
    private String medicareSpecifications;//医保规格
    private String medicareUnit;//医保单位
    private String toxicology;//毒理分类
    private String toxicology_name;//毒理分类名称
    private String prescription;//处方用药
    private String gmp;//gmp药品
    private String antimicrobial;//抗菌药分类id
    private String antimicrobialName;//抗菌药分类名称
    private String supplier;//供应商
    private String manufacturer;//厂商
    private String remark;//备注
    private String volumeUnit;//体积单位
    private String weightUnit;//重量单位
    private String drugDose;//用药剂量
    private Integer amount;//用药总量
    private String amountUnit;//总量单位
    private String amountUnitName;//总量单位名称
    private Integer days;//用药天数
    private String frenquency;//用药频次
    private String method;//用药方法
    private Integer status;//状态(1生效 0失效)
    private Date createTime;//创建时间
    private Date updateTime;//更新时间
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getPyName() {
        return pyName;
    }
    public void setPyName(String pyName) {
        this.pyName = pyName;
    }
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
    public String getSubjectClassName() {
        return subjectClassName;
    }
    public void setSubjectClassName(String subjectClassName) {
        this.subjectClassName = subjectClassName;
    }
    public String getCommonName() {
        return commonName;
    }
    public void setCommonName(String commonName) {
        this.commonName = commonName;
    }
    public String getPyCommonName() {
        return pyCommonName;
    }
    public void setPyCommonName(String pyCommonName) {
        this.pyCommonName = pyCommonName;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    public String getGyzz() {
        return gyzz;
    }
    public void setGyzz(String gyzz) {
        this.gyzz = gyzz;
    }
    public String getUnit() {
        return unit;
    }
    public void setUnit(String unit) {
        this.unit = unit;
    }
    public String getPackingSpecifications() {
        return packingSpecifications;
    }
    public void setPackingSpecifications(String packingSpecifications) {
        this.packingSpecifications = packingSpecifications;
    }
    public Integer getIsSplit() {
        return isSplit;
    }
    public void setIsSplit(Integer isSplit) {
        this.isSplit = isSplit;
    }
    public String getDrugSpecifications() {
        return drugSpecifications;
    }
    public void setDrugSpecifications(String drugSpecifications) {
        this.drugSpecifications = drugSpecifications;
    }
    public String getDosageForm() {
        return dosageForm;
    }
    public void setDosageForm(String dosageForm) {
        this.dosageForm = dosageForm;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    public String getMinDose() {
        return minDose;
    }
    public void setMinDose(String minDose) {
        this.minDose = minDose;
    }
    public String getDoseUnit() {
        return doseUnit;
    }
    public void setDoseUnit(String doseUnit) {
        this.doseUnit = doseUnit;
    }
    public String getDoseUnitName() {
        return doseUnitName;
    }
    public void setDoseUnitName(String doseUnitName) {
        this.doseUnitName = doseUnitName;
    }
    public String getManageClass() {
        return manageClass;
    }
    public void setManageClass(String manageClass) {
        this.manageClass = manageClass;
    }
    public BigDecimal getRetailPrice() {
        return retailPrice;
    }
    public void setRetailPrice(BigDecimal retailPrice) {
        this.retailPrice = retailPrice;
    }
    public String getMedicareSpecifications() {
        return medicareSpecifications;
    }
    public void setMedicareSpecifications(String medicareSpecifications) {
        this.medicareSpecifications = medicareSpecifications;
    }
    public String getMedicareUnit() {
        return medicareUnit;
    }
    public void setMedicareUnit(String medicareUnit) {
        this.medicareUnit = medicareUnit;
    }
    public String getToxicology() {
        return toxicology;
    }
    public void setToxicology(String toxicology) {
        this.toxicology = toxicology;
    }
    public String getToxicology_name() {
        return toxicology_name;
    }
    public void setToxicology_name(String toxicology_name) {
        this.toxicology_name = toxicology_name;
    }
    public String getPrescription() {
        return prescription;
    }
    public void setPrescription(String prescription) {
        this.prescription = prescription;
    }
    public String getGmp() {
        return gmp;
    }
    public void setGmp(String gmp) {
        this.gmp = gmp;
    }
    public String getAntimicrobial() {
        return antimicrobial;
    }
    public void setAntimicrobial(String antimicrobial) {
        this.antimicrobial = antimicrobial;
    }
    public String getAntimicrobialName() {
        return antimicrobialName;
    }
    public void setAntimicrobialName(String antimicrobialName) {
        this.antimicrobialName = antimicrobialName;
    }
    public String getSupplier() {
        return supplier;
    }
    public void setSupplier(String supplier) {
        this.supplier = supplier;
    }
    public String getManufacturer() {
        return manufacturer;
    }
    public void setManufacturer(String manufacturer) {
        this.manufacturer = manufacturer;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getVolumeUnit() {
        return volumeUnit;
    }
    public void setVolumeUnit(String volumeUnit) {
        this.volumeUnit = volumeUnit;
    }
    public String getWeightUnit() {
        return weightUnit;
    }
    public void setWeightUnit(String weightUnit) {
        this.weightUnit = weightUnit;
    }
    public String getDrugDose() {
        return drugDose;
    }
    public void setDrugDose(String drugDose) {
        this.drugDose = drugDose;
    }
    public Integer getAmount() {
        return amount;
    }
    public void setAmount(Integer amount) {
        this.amount = amount;
    }
    public String getAmountUnit() {
        return amountUnit;
    }
    public void setAmountUnit(String amountUnit) {
        this.amountUnit = amountUnit;
    }
    public String getAmountUnitName() {
        return amountUnitName;
    }
    public void setAmountUnitName(String amountUnitName) {
        this.amountUnitName = amountUnitName;
    }
    public Integer getDays() {
        return days;
    }
    public void setDays(Integer days) {
        this.days = days;
    }
    public String getFrenquency() {
        return frenquency;
    }
    public void setFrenquency(String frenquency) {
        this.frenquency = frenquency;
    }
    public String getMethod() {
        return method;
    }
    public void setMethod(String method) {
        this.method = method;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}

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

@ -548,6 +548,9 @@ public class BaseHospitalRequestMapping {
        public static final String appletSign= "/appletSign";
        public static final String doorServiceTest= "/doorServiceTest";
        public static final String saveNationalDrug = "/saveNationalDrug";//保存药品字典
        public static final String getNationalDrugList = "/getNationalDrugList";//获取药品字典
        public static final String updateNationalDrugStatus = "/updateNationalDrugStatus";//更新药品字典状态
    }
    public static class YkyyPrescription extends BaseHospitalRequestMapping.Basic {
@ -1454,6 +1457,11 @@ public class BaseHospitalRequestMapping {
        public static final String findDict = "/findDict";
        public static final String delDict = "/delDict";
        public static final String createOrUpdateDict = "/createOrUpdateDict";
        //系统参数配置
        public static final String getHospitalParameterList = "/getHospitalParameterList";
        public static final String createOrUpdateParameter = "createOrUpdateParameter";
        public static final String delHospitalParameter = "delHospitalParameter";
    }
    /**

+ 70 - 0
common/common-util/src/main/java/com/yihu/jw/util/common/PingyinUtils.java

@ -0,0 +1,70 @@
package com.yihu.jw.util.common;
import net.sourceforge.pinyin4j.PinyinHelper;
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
/**
 * create by hmf on 2021/2/8
 */
public class PingyinUtils {
    /**
     * 汉字转换为汉语拼音首字母,英文字符不变
     * @param chines 汉字
     * @return 拼音
     */
    public static String converterToFirstSpell(String chines){
        String pinyinName = "";
        //转化为字符
        char[] nameChar = chines.toCharArray();
        //汉语拼音格式输出类
        HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
        //输出设置,大小写,音标方式等
        defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
        defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
        for (int i = 0; i < nameChar.length; i++) {
            //如果是中文
            if (nameChar[i] > 128) {
                try {
                    pinyinName +=
                            PinyinHelper.toHanyuPinyinStringArray(nameChar[i], defaultFormat)[0].charAt(0);
                } catch (BadHanyuPinyinOutputFormatCombination e) {
                    e.printStackTrace();
                }
            }else{//为英文字符
                pinyinName += nameChar[i];
            }
        }
        return pinyinName;
    }
    /**
     * 汉字转换位汉语拼音,英文字符不变
     * @param chines 汉字
     * @return 拼音
     */
    public static String converterToSpell(String chines){
        String pinyinName = "";
        char[] nameChar = chines.toCharArray();
        HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
        defaultFormat.setCaseType(HanyuPinyinCaseType.UPPERCASE);
        defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
        for (int i = 0; i < nameChar.length; i++) {
            if (nameChar[i] > 128) {
                try {
                    pinyinName += PinyinHelper.toHanyuPinyinStringArray(nameChar[i], defaultFormat)[0];
                } catch (BadHanyuPinyinOutputFormatCombination e) {
                    e.printStackTrace();
                }
            }else{
                pinyinName += nameChar[i];
            }
        }
        return pinyinName;
    }
}

+ 70 - 6
server/svr-authentication/pom.xml

@ -203,19 +203,83 @@
        <finalName>svr-authentication</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <mainClass>com.yihu.AuthServer</mainClass>
                    <archive>
                        <!-- 生成的jar中,不要包含pom.xml和pom.properties这两个文件 -->
                        <addMavenDescriptor>false</addMavenDescriptor>
                        <manifest>
                            <!-- 是否要把第三方jar加入到类构建路径 -->
                            <addClasspath>true</addClasspath>
                            <!-- 外部依赖jar包的最终位置 -->
                            <classpathPrefix>lib/</classpathPrefix>
                            <mainClass>com.yihu.AuthServer</mainClass>
                        </manifest>
                    </archive>
                </configuration>
            </plugin>
            <!--拷贝依赖到jar外面的lib目录-->
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-lib</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                        <configuration>
                            <!-- 依赖包输出目录,将来不打进jar包里 -->
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <excludeTransitive>false</excludeTransitive>
                            <stripVersion>false</stripVersion>
                            <includeScope>runtime</includeScope>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <!--指定配置文件,将resources打成外部resource-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                    <archive>
                        <!-- 指定配置文件目录,这样jar运行时会去找到同目录下的resources文件夹下查找 -->
                        <manifestEntries>
                            <Class-Path>resources/</Class-Path>
                        </manifestEntries>
                    </archive>
                    <!-- 打包时忽略的文件(也就是不打进jar包里的文件) -->
                    <excludes>
                        <exclude>**/*.yml</exclude>
                        <exclude>**/*.xml</exclude>
                    </excludes>
                </configuration>
            </plugin>
            <!-- 拷贝资源文件 外面的resource目录-->
            <plugin>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-dependencies</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-resources</goal>
                        </goals>
                        <configuration>
                            <!-- 资源文件输出目录 -->
                            <outputDirectory>${project.build.directory}/resources</outputDirectory>
                            <resources>
                                <resource>
                                    <directory>src/main/resources</directory>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>

svr/svr-door-serivce/pom.xml → svr/svr-door-service/pom.xml


svr/svr-door-serivce/readme.MD → svr/svr-door-service/readme.MD


svr/svr-door-serivce/sql/初始sql.sql → svr/svr-door-service/sql/初始sql.sql


svr/svr-door-serivce/sql/随访记录详情新增索引.txt → svr/svr-door-service/sql/随访记录详情新增索引.txt


svr/svr-door-serivce/src/main/java/com/yihu/SvrDoorServiceApplication.java → svr/svr-door-service/src/main/java/com/yihu/SvrDoorServiceApplication.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/config/jpa/DoorServiceJpa.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/config/jpa/DoorServiceJpa.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/config/jpa/HibernateProperties.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/config/jpa/HibernateProperties.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/BaseController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/BaseController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/common/DistrictController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/common/DistrictController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/common/EntranceController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/common/EntranceController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoctorConsultController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorConsultController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoctorController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoctorDoorServiceAuditController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorDoorServiceAuditController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoctorQuickReplyController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoctorQuickReplyController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoorOrderController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoorOrderController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoorStatisticAnalyzeController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/DoorStatisticAnalyzeController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/followup/DoctorFollowUpController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/followup/DoctorFollowUpController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/followup/DoctorFollowupDrugsController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/doctor/followup/DoctorFollowupDrugsController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/ConsultController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/ConsultController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/DoorCommentController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/DoorCommentController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/PatientController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/PatientController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/PatientDoorServiceApplicationController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/PatientDoorServiceApplicationController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorCommentController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorCommentController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorCommentDoctorController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorCommentDoctorController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorConclusionController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorConclusionController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorDoctorController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorDoctorController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorDoctorFeeController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorDoctorFeeController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorFeeDetailController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorFeeDetailController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorPatientConfirmLogController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorPatientConfirmLogController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorServiceOrderController.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/controller/patient/WlyyDoorServiceOrderController.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/DoctorRegistrationDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoctorRegistrationDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/DoctorRegistrationTempDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoctorRegistrationTempDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/DoorServiceApplicationDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceApplicationDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/DoorServiceConfigureDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceConfigureDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/DoorServiceOrderDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceOrderDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/DoorServiceVoucherDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/DoorServiceVoucherDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorCancelLogDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorCancelLogDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorCommentDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorCommentDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorCommentDoctorDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorCommentDoctorDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorConclusionDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorConclusionDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorFeeDictDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorFeeDictDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorStatusDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorDoctorStatusDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorFeeDetailDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorFeeDetailDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorOrderItemDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorOrderItemDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorPatientConfirmLogDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPatientConfirmLogDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDetailDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDetailDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDrugDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorPrescriptionDrugDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorProcessLogDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorProcessLogDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorServiceOrderDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorServiceOrderDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/WlyyDoorTransRecordDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/WlyyDoorTransRecordDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/common/SignFamilyDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/common/SignFamilyDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/consult/DoctorQuickReplyDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/consult/DoctorQuickReplyDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/followup/FollowUpDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/followup/FollowUpDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/dao/followup/FollowupDrugsDao.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/dao/followup/FollowupDrugsDao.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoctorRegistrationTempService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoctorRegistrationTempService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorCommentService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorCommentService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorOrderService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorOrderService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorServiceApplicationService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorServiceApplicationService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorServiceVoucherService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/DoorServiceVoucherService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorCancelLogService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorCancelLogService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorCommentDoctorService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorCommentDoctorService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorCommentService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorCommentService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorConclusionService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorConclusionService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorFeeDictService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorFeeDictService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorStatusService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorDoctorStatusService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorFeeDetailService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorFeeDetailService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorPatientConfirmLogService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorPatientConfirmLogService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorPrescriptionService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorPrescriptionService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorProcessLogService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorProcessLogService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorTransRecordService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/WlyyDoorTransRecordService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/HospitalService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/HospitalService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/PatientService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/PatientService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/ServerPackageService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/ServerPackageService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/WlyyMessageService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/WlyyMessageService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/WlyySystemDictService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/common/WlyySystemDictService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/consult/ConsultTeamService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/consult/ConsultTeamService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/consult/DoctorQuickReplyService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/consult/DoctorQuickReplyService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/followup/FollowUpService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/followup/FollowUpService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/followup/FollowupDrugsService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/followup/FollowupDrugsService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/prescription/JwDoorPrescriptionService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/prescription/JwDoorPrescriptionService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/prescription/PresModeAdapter.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/prescription/PresModeAdapter.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/statics/DoorStatisticAnalyzeService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/statics/DoorStatisticAnalyzeService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/statics/StatisticsUtilService.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/service/statics/StatisticsUtilService.java


svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java → svr/svr-door-service/src/main/java/com/yihu/jw/door/util/MessageUtil.java


+ 0 - 0
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/StreamUtil.java


Some files were not shown because too many files changed in this diff