suqinyi před 1 rokem
rodič
revize
a55542a877
14 změnil soubory, kde provedl 244 přidání a 175 odebrání
  1. 97 0
      business/base-service/src/main/java/com/yihu/jw/hospital/jw/JwArchiveRecordBaseService.java
  2. 13 14
      business/base-service/src/main/java/com/yihu/jw/hospital/message/service/SystemMessageService.java
  3. 2 2
      business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java
  4. 11 0
      common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageSubItemDO.java
  5. 3 6
      svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/WlyyDoorServiceOrderController.java
  6. 1 3
      svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java
  7. 2 2
      business/base-service/src/main/java/com/yihu/jw/jw/service/JwArchivesService.java
  8. 2 2
      business/base-service/src/main/java/com/yihu/jw/jw/service/JwSmjkService.java
  9. 28 32
      svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/PatientRecordService.java
  10. 72 73
      svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java
  11. 9 0
      svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/score/controller/DoorCommentController.java
  12. 1 1
      business/base-service/src/main/java/com/yihu/jw/system/dao/SystemDictDao.java
  13. 2 39
      business/base-service/src/main/java/com/yihu/jw/system/service/SystemDictService.java
  14. 1 1
      common/common-util/src/main/java/com/yihu/jw/util/DoctorAssistantUtil.java

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 97 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/jw/JwArchiveRecordBaseService.java


+ 13 - 14
business/base-service/src/main/java/com/yihu/jw/hospital/message/service/SystemMessageService.java

@ -17,7 +17,6 @@ import com.yihu.jw.hospital.message.dao.SpecialistDynamicMessagesDao;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.system.service.SystemDictService;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.YkyySMSService;
@ -62,8 +61,7 @@ public class SystemMessageService extends BaseJpaService<SystemMessageDO, System
    private MessageNoticeSettingDao messageNoticeSettingDao;
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
    SystemDictService systemDictService;
    @Autowired
    SpecialistDynamicMessagesDao specialistDynamicMessagesDao;
@ -325,23 +323,24 @@ public class SystemMessageService extends BaseJpaService<SystemMessageDO, System
            specialistDynamicMessages.setResult(result);
            specialistDynamicMessages.setName(patientName);
            specialistDynamicMessages.setCode(patient.getId());
            if (doctor != null) {
            //这边需要修改医生的信息-20231019
//            if (doctor != null) {
//                specialistDynamicMessages.setDoctor(doctor.getCode());
//                specialistDynamicMessages.setHospital(doctor.getHospital());
                doctorName = doctor.getName();
            } else if (signFamily != null) {
                specialistDynamicMessages.setDoctor(signFamily.getDoctor());
                specialistDynamicMessages.setHospital(signFamily.getHospital());
                doctorName = signFamily.getDoctorName();
            }
//            specialistDynamicMessages.setSpecialist(specialist.getCode());
//            specialistDynamicMessages.setSpecialistHospital(specialist.getHospital());
//                doctorName = doctor.getName();
//            }
//            else if (signFamily != null) {
//                specialistDynamicMessages.setDoctor(signFamily.getDoctor());
//                specialistDynamicMessages.setHospital(signFamily.getHospital());
//                doctorName = signFamily.getDoctorName();
//            }
            specialistDynamicMessages.setDiseaseType(disease);
            specialistDynamicMessages.setCodeType("2");
            specialistDynamicMessages.setCreateTime(DateUtil.getStringDate());
            specialistDynamicMessages.setType(type);
            Map<String, String> copywritingMap = systemDictService.getDictMap("DynamicMessages" + type);
            //这边后面改成用sql查-20231019
//            Map<String, String> copywritingMap = systemDictService.getDictMap("DynamicMessages" + type);
            Map<String, String> copywritingMap = null;
            //获取文案模板
            String content = copywritingMap.get("doctor");
            content = content.replace("【医生】", specialistName).replace("【居民】", patientName);

+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@ -9,12 +9,12 @@ import com.yihu.jw.entity.hospital.prescription.WlyyInspectionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import com.yihu.jw.healthCare.service.HealthCareService;
import com.yihu.jw.hospital.jw.JwArchiveRecordBaseService;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
import com.yihu.jw.hospital.prescription.dao.WlyyInspectionDao;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.jw.service.JwArchivesService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientGroupDao;
@ -91,7 +91,7 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
    private HospitalSysDictDao hospitalSysDictDao;
    @Autowired
    JwArchivesService jwArchivesService;
    JwArchiveRecordBaseService jwArchivesService;
    @Value("${wechat.id}")
    private String wxId;

+ 11 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageSubItemDO.java

@ -6,6 +6,7 @@ import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -49,6 +50,16 @@ public class ServicePackageSubItemDO extends UuidIdentityEntity implements java.
    @Column(name = "create_time")
    private Date createTime;
    @Column(name = "price")
    private BigDecimal price;
    public BigDecimal getPrice() {
        return price;
    }
    public void setPrice(BigDecimal price) {
        this.price = price;
    }
    public String getName() {
        return name;

+ 3 - 6
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/WlyyDoorServiceOrderController.java

@ -69,11 +69,13 @@ public class WlyyDoorServiceOrderController extends EnvelopRestEndpoint {
    /**
     * 居民端 上门服务预约工单的状态分组统计数量
     * 参数:patient: 0fab4dd67e074e16ac86db6b6c15233e
     */
    @GetMapping(value = "queryInfoStatusCountList")
    @ApiOperation(value = "统计上门服务工单各状态下的数量列表")
    public Envelop queryInfoStatusCountList(
            @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient", required = false) String patient) {
            @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient", required = false) String patient
    ) {
        JSONObject result = wlyyDoorServiceOrderService.queryInfoStatusCountList(patient);
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return failed(result.getString(ResponseContant.resultMsg));
@ -106,7 +108,6 @@ public class WlyyDoorServiceOrderController extends EnvelopRestEndpoint {
    }
    @PostMapping(value = "qucikSendIM")
    @ApiOperation(value = "通过IM向客户端推送消息")
    public Envelop qucikSendIM(
@ -160,9 +161,6 @@ public class WlyyDoorServiceOrderController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "list")
    @ApiOperation(value = "获取列表")
    public Envelop list(
@ -180,7 +178,6 @@ public class WlyyDoorServiceOrderController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "twoDimensionalCode")
    @ApiOperation(value = "生成二维码接口")
    public Envelop twoDimensionalCode(

+ 1 - 3
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@ -16,13 +16,12 @@ import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.hospital.module.followup.dao.*;
import com.yihu.jw.hospital.module.rehabilitation.service.RehabilitationManageService;
import com.yihu.jw.hospital.module.system.service.SystemDictService;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.task.PushMsgTask;
import com.yihu.jw.hospital.team.dao.WlyySignFamilyDao;
import com.yihu.jw.message.service.MessageService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.system.service.SystemDictService;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.idcard.IdCardUtil;
@ -40,7 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;

+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/jw/service/JwArchivesService.java

@ -1,6 +1,6 @@
package com.yihu.jw.jw.service;
package com.yihu.jw.hospital.module.jw.service;
import com.yihu.jw.system.service.SystemDictService;
import com.yihu.jw.hospital.module.system.service.SystemDictService;
import com.yihu.jw.util.http.HttpClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;

+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/jw/service/JwSmjkService.java

@ -1,9 +1,9 @@
package com.yihu.jw.jw.service;
package com.yihu.jw.hospital.module.jw.service;
import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.entity.hospital.booking.ReservationHospitalDept;
import com.yihu.jw.hospital.module.system.service.SystemDictService;
import com.yihu.jw.hospital.prescription.vo.GuahaoDoctor;
import com.yihu.jw.system.service.SystemDictService;
import com.yihu.jw.util.common.XMLUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;

+ 28 - 32
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/PatientRecordService.java

@ -1,13 +1,11 @@
package com.yihu.jw.hospital.module.rehabilitation.service;
import com.alibaba.fastjson.JSON;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.entity.patient.PatientEvent;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.jw.service.JwArchivesService;
import com.yihu.jw.jw.service.JwSmjkService;
import com.yihu.jw.hospital.module.jw.service.JwArchivesService;
import com.yihu.jw.hospital.module.jw.service.JwSmjkService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.PatientEventDao;
import com.yihu.jw.patient.service.BasePatientService;
@ -20,7 +18,6 @@ import org.hibernate.Session;
import org.hibernate.transform.Transformers;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@ -33,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.io.*;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
@ -602,32 +598,32 @@ public class PatientRecordService {
        return re;
    }
    /**
     * 根据身份证号换取居民请求秘钥
     *
     * @param idcard
     * @return
     */
    public com.alibaba.fastjson.JSONObject getPatientAccetokenByIdcard(String idcard) throws Exception {
        BasePatientDO patient = patientService.findInfoByIdCard(idcard);
        if (patient == null) {
            if (patientService.addPaitentByIdcard(idcard) == null) {
                throw new Exception("该身份证查询不到居民");
            }
            List<BasePatientDO>  patientList = patientDao.getPatientByIdcardOrSsc(idcard);//重新获取该患者信息
            patient = patientList.get(0);
        }
        if (null != patient) {
            String uuid = UUID.randomUUID().toString();
            redisTemplate.opsForValue().set("patient_" + uuid, idcard, 3600, TimeUnit.SECONDS);
            com.alibaba.fastjson.JSONObject result = new com.alibaba.fastjson.JSONObject();
            result.put("patientCode", uuid);
            result.put("create_time", DateUtil.dateToStrLong(new Date()));
            result.put("expires_in", 3600);
            return result;
        }
        return null;
    }
//    /**
//     * 根据身份证号换取居民请求秘钥
//     *
//     * @param idcard
//     * @return
//     */
//    public com.alibaba.fastjson.JSONObject getPatientAccetokenByIdcard(String idcard) throws Exception {
//        BasePatientDO patient = patientService.findInfoByIdCard(idcard);
//        if (patient == null) {
//            if (patientService.addPaitentByIdcard(idcard) == null) {
//                throw new Exception("该身份证查询不到居民");
//            }
//            List<BasePatientDO>  patientList = patientDao.getPatientByIdcardOrSsc(idcard);//重新获取该患者信息
//            patient = patientList.get(0);
//        }
//        if (null != patient) {
//            String uuid = UUID.randomUUID().toString();
//            redisTemplate.opsForValue().set("patient_" + uuid, idcard, 3600, TimeUnit.SECONDS);
//            com.alibaba.fastjson.JSONObject result = new com.alibaba.fastjson.JSONObject();
//            result.put("patientCode", uuid);
//            result.put("create_time", DateUtil.dateToStrLong(new Date()));
//            result.put("expires_in", 3600);
//            return result;
//        }
//        return null;
//    }
    /**
     * 根据居民缓存TOKEN换取居民CODE

+ 72 - 73
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java

@ -10,20 +10,19 @@ import com.yihu.jw.entity.door.SignFamily;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.entity.rehabilitation.PatientDischargeDO;
import com.yihu.jw.entity.specialist.rehabilitation.PatientMedicalRecordsDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationAdviceDO;
import com.yihu.jw.entity.util.TransforSqlUtl;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.module.rehabilitation.dao.PatientDischargeDao;
import com.yihu.jw.hospital.module.specialist.dao.PatientMedicalRecordsRehabilitationDao;
import com.yihu.jw.hospital.module.system.dao.SystemDictDao;
import com.yihu.jw.hospital.task.PushMsgTask;
import com.yihu.jw.hospital.team.dao.WlyySignFamilyDao;
import com.yihu.jw.hospital.utils.WeiXinAccessTokenUtils;
import com.yihu.jw.hospital.utils.WeiXinOpenIdUtils;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.system.dao.SystemDictDao;
import com.yihu.jw.util.DoctorAssistantUtil;
import com.yihu.jw.hospital.utils.DoctorAssistantUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
@ -808,77 +807,77 @@ public class RehabilitationInfoService  {
     * @param doctorCode
     * @return
     */
    public JSONObject getPatientByIdcardOrSsc(String patientInfo, Integer type, String doctorCode) {
        //加签列表查询wlyy_patient_discharge表,与type无关。当家签处添加时(即type=1),统一保存type=2的记录
        JSONObject data = new JSONObject();
        List<BasePatientDO> patientList = patientDao.getPatientByIdcardOrSsc(patientInfo);
        BasePatientDO patient = null;
        if(patientList.size() == 0){
            //未找到居民,从健康档案添加居民
            if(type==2){
                patient = patientService.addPaitentByIdcard(patientInfo);
            }
        }else{
            patient = patientList.get(0);
        }
        if(patient==null){
            data.put("status", -1);
            data.put("msg", "未查询到患者");
            return data;
        }
        BaseDoctorDO doctor = doctorDao.findById(doctorCode).orElse(null);
        //判断是否添加过该居民
        Integer patientDischargeDOS =0;
        if (type==2){//查询下转是否存在该患者:sign_status=1(包括type==null,type==2) 1.6.8后新增未家签的也能添加患者 判断条件(d.type=2 and sign_status=0)
            String sql = "select count(1) from wlyy_patient_discharge d where d.create_user='"+doctorCode+"' and d.idcard='"+patient.getIdcard()+"'and (sign_status=1 and ( ISNULL(d.type) or d.type=2) or (d.type=2 and sign_status=0))";
            patientDischargeDOS = jdbcTemplate.queryForObject(sql,Integer.class);
        }
        else{//查询加签列表是否存在该患者
            String sql = "select count(1) from wlyy_patient_discharge d where d.create_user='"+doctorCode+"' and d.idcard='"+patient.getIdcard()+"'";
            patientDischargeDOS = jdbcTemplate.queryForObject(sql,Integer.class);
        }
        if(patientDischargeDOS > 0){
            data.put("status", -1);
            data.put("msg", "该患者已添加过,请勿重复添加");
            return data;
        }
        PatientDischargeDO patientDischargeDO = new PatientDischargeDO();
        patientDischargeDO.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
        patientDischargeDO.setType(2);//统一保存为2
        patientDischargeDO.setPatient(patient.getId());
        patientDischargeDO.setName(patient.getName());
        patientDischargeDO.setIdcard(patient.getIdcard());
        patientDischargeDO.setSsc(patient.getSsc());
        patientDischargeDO.setAddress(patient.getAddress());
        patientDischargeDO.setCreateUser(doctorCode);
        patientDischargeDO.setCreateUserName(doctor.getName());
        patientDischargeDO.setCreateTime(new Date());
        //判断是否家签  修改
        SignFamily signFamily = signFamilyDao.getExpensesSignByIdcard(patient.getIdcard());
        if(signFamily != null ) {
            patientDischargeDO.setSignStatus(1);
            patientDischargeDO.setHospital(signFamily.getHospital());
            patientDischargeDO.setHospitalName(signFamily.getHospitalName());
            patientDischargeDao.save(patientDischargeDO);
        }else {
            patientDischargeDO.setSignStatus(0);
//            if (type == 1){//添加签约患者加签列表
            patientDischargeDao.save(patientDischargeDO);
//            }else if(type == 2) {
//                patientDischargeDao.save(patientDischargeDO);
//                data.put("status", -1);
//                data.put("msg", "该患者未家签,请家签后重试");
//                return data;
//    public JSONObject getPatientByIdcardOrSsc(String patientInfo, Integer type, String doctorCode) {
//        //加签列表查询wlyy_patient_discharge表,与type无关。当家签处添加时(即type=1),统一保存type=2的记录
//        JSONObject data = new JSONObject();
//        List<BasePatientDO> patientList = patientDao.getPatientByIdcardOrSsc(patientInfo);
//        BasePatientDO patient = null;
//        if(patientList.size() == 0){
//            //未找到居民,从健康档案添加居民
//            if(type==2){
//                patient = patientService.addPaitentByIdcard(patientInfo);
//            }
        }
        data.put("status", 200);
        data.put("data", patientDischargeDO);
        return data;
    }
//        }else{
//            patient = patientList.get(0);
//        }
//
//        if(patient==null){
//            data.put("status", -1);
//            data.put("msg", "未查询到患者");
//            return data;
//        }
//
//        BaseDoctorDO doctor = doctorDao.findById(doctorCode).orElse(null);
//        //判断是否添加过该居民
//        Integer patientDischargeDOS =0;
//        if (type==2){//查询下转是否存在该患者:sign_status=1(包括type==null,type==2) 1.6.8后新增未家签的也能添加患者 判断条件(d.type=2 and sign_status=0)
//            String sql = "select count(1) from wlyy_patient_discharge d where d.create_user='"+doctorCode+"' and d.idcard='"+patient.getIdcard()+"'and (sign_status=1 and ( ISNULL(d.type) or d.type=2) or (d.type=2 and sign_status=0))";
//            patientDischargeDOS = jdbcTemplate.queryForObject(sql,Integer.class);
//        }
//        else{//查询加签列表是否存在该患者
//            String sql = "select count(1) from wlyy_patient_discharge d where d.create_user='"+doctorCode+"' and d.idcard='"+patient.getIdcard()+"'";
//            patientDischargeDOS = jdbcTemplate.queryForObject(sql,Integer.class);
//        }
//        if(patientDischargeDOS > 0){
//            data.put("status", -1);
//            data.put("msg", "该患者已添加过,请勿重复添加");
//            return data;
//        }
//
//        PatientDischargeDO patientDischargeDO = new PatientDischargeDO();
//        patientDischargeDO.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
//        patientDischargeDO.setType(2);//统一保存为2
//        patientDischargeDO.setPatient(patient.getId());
//        patientDischargeDO.setName(patient.getName());
//        patientDischargeDO.setIdcard(patient.getIdcard());
//        patientDischargeDO.setSsc(patient.getSsc());
//        patientDischargeDO.setAddress(patient.getAddress());
//        patientDischargeDO.setCreateUser(doctorCode);
//        patientDischargeDO.setCreateUserName(doctor.getName());
//        patientDischargeDO.setCreateTime(new Date());
//        //判断是否家签  修改
//        SignFamily signFamily = signFamilyDao.getExpensesSignByIdcard(patient.getIdcard());
//        if(signFamily != null ) {
//            patientDischargeDO.setSignStatus(1);
//            patientDischargeDO.setHospital(signFamily.getHospital());
//            patientDischargeDO.setHospitalName(signFamily.getHospitalName());
//            patientDischargeDao.save(patientDischargeDO);
//        }else {
//            patientDischargeDO.setSignStatus(0);
////            if (type == 1){//添加签约患者加签列表
//            patientDischargeDao.save(patientDischargeDO);
////            }else if(type == 2) {
////                patientDischargeDao.save(patientDischargeDO);
////                data.put("status", -1);
////                data.put("msg", "该患者未家签,请家签后重试");
////                return data;
////            }
//        }
//        data.put("status", 200);
//        data.put("data", patientDischargeDO);
//
//        return data;
//    }
    public JSONObject getUnm(String doctor,String patient){
        String sqlMe = "select d.id,d.plan_id as planId,i.code,i.name,p.patient,d.frequency_code from wlyy_specialist.wlyy_rehabilitation_plan_detail d \n" +

+ 9 - 0
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/score/controller/DoorCommentController.java

@ -25,6 +25,15 @@ public class DoorCommentController extends EnvelopRestEndpoint {
    @Autowired
    WlyyDoorCommentService doorCommentService;
    /**
     * 参数:
     * orderId: 4028f8f68b216198018b22bcfcbb018f
     * professionalSkill: 100
     * serveAttitude: 100
     * serveEfficiency: 100
     * description: 1
     * isAnonymous: 0
     */
    @RequestMapping(value = "/add", method = RequestMethod.POST)
    @ApiOperation(value = "添加居民评分")
    public String add(

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/system/dao/SystemDictDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.system.dao;
package com.yihu.jw.hospital.module.system.dao;
import com.yihu.jw.entity.base.system.SystemDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 2 - 39
business/base-service/src/main/java/com/yihu/jw/system/service/SystemDictService.java

@ -1,17 +1,13 @@
package com.yihu.jw.system.service;
package com.yihu.jw.hospital.module.system.service;
import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.system.dao.SystemDictDao;
import com.yihu.jw.hospital.module.system.dao.SystemDictDao;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -112,37 +108,4 @@ public class SystemDictService {
        return systemDictDao.delete(dictName);
    }
    /**
     * 保存健康教育设置字典
     * @param dictName
     * @param isComment
     */
//    public void save(String dictName, String isComment) {
//        SystemDict systemDict = new SystemDict();
//        systemDict.setDictName(dictName);
//        systemDict.setCode(isComment);
//        if (isComment.equals("0")) {
//            systemDict.setValue("不允许");
//        } else if (isComment.equals("1")) {
//            systemDict.setValue("允许");
//        }
//        systemDict.setSort(1);
//        systemDictDao.save(systemDict);
//    }
//    public void saveJkeduNotDisturb(String dictName, String json) {
//        JSONArray jsonArray = new JSONArray(json);
//        List<SystemDict> list = new ArrayList<>();
//        int code = 1;
//        for (Object object : jsonArray){
//            SystemDict systemDict = new SystemDict();
//            systemDict.setDictName(dictName);
//            systemDict.setCode(code + "");
//            systemDict.setValue(((JSONObject)object).toString());
//            systemDict.setSort(code);
//            list.add(systemDict);
//            code ++;
//        }
//        systemDictDao.save(list);
//    }
}

+ 1 - 1
common/common-util/src/main/java/com/yihu/jw/util/DoctorAssistantUtil.java

@ -1,4 +1,4 @@
package com.yihu.jw.util;
package com.yihu.jw.hospital.utils;
import com.yihu.jw.util.http.HttpClientUtil;
import org.apache.http.NameValuePair;