Merge branch 'srdev' of chenweida/patient-co-management into srdev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/concern/ConcernService.java

@@ -20,6 +20,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
@@ -209,12 +210,17 @@ public class ConcernService extends BaseService {
     * @param doctorCode
     * @return
     */
    public List<Patient> listPatientsByDoctorCode(String doctorCode,Integer page,Integer pageSize) {
    public List<Patient> listPatientsByDoctorCode(String doctorCode,String patientName,Integer page,Integer pageSize) {
        if(StringUtils.isEmpty(patientName)){
            patientName="";
        }
        String sql="select  " +
                " p.`code`,p.name,p.idcard,p.sex,p.photo,p.openid,c.create_time concern_create_time,c.code concern_code " +
                " from wlyy_patient p,wlyy_concern c " +
                " where " +
                " p.`code`=c.patient and " +
                " c.name like '%"+patientName+"%' and " +
                " c.concern_doctor_code= '"+doctorCode+"'and" +
                " c.`status`=1 " +
                " order by concern_create_time desc limit "+(page*pageSize)+","+pageSize;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/concern/DoctorConcernController.java

@@ -37,6 +37,7 @@ public class DoctorConcernController extends BaseController {
    @ApiOperation(value = "获取医生关注的患者", notes = "", response = Patient.class)
    public String getConcernDoctors(
            @ApiParam(name = "doctor", value = "医生", required = false) @RequestParam(required = false, name = "doctor") String doctor,
            @ApiParam(name = "patientName", value = "患者名称 支持模糊查找", required = false) @RequestParam(required = false, name = "patientName") String patientName,
            @ApiParam(name = "page", value = "当前页(从0开始)", required = true) @RequestParam(required = true, name = "page") Integer page,
            @ApiParam(name = "pageSize", value = "每页显示条数", required = true) @RequestParam(required = true, name = "pageSize") Integer pageSize
@@ -46,7 +47,7 @@ public class DoctorConcernController extends BaseController {
                doctor = getUID();
            }
            JSONArray array = new JSONArray();
            List<Patient> patients = concernService.listPatientsByDoctorCode(doctor, page, pageSize);
            List<Patient> patients = concernService.listPatientsByDoctorCode(doctor,patientName, page, pageSize);
            for (Patient patient : patients) {
                JSONObject jsonObject = new JSONObject();
                jsonObject.put("code", patient.getCode());

patient-co/patient-co-wlyy/src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ doctorAssistant:
  target_url: home/html/unreadMessageStatistic.html
wlyy:
  hospital: 3502050100 # 默认医院code
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://172.19.103.88:3000/

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -34,7 +34,7 @@ im:
  data_base_name: im_new
wlyy:
  hospital: 3502050100 # 默认医院code
  hospital: 49229004X # 默认医院code
#物联网配置
iot:

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ doctorAssistant:
  target_url: home/html/unreadMessageStatistic.html
wlyy:
  hospital: 3502030400 # 默认医院code
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://27.155.101.77:3000/

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -28,7 +28,7 @@ doctorAssistant:
  target_url: home/html/unreadMessageStatistic.html
wlyy:
  hospital: 3502050100 # 默认医院code
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://172.19.103.88:3000/

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8080
  port: 8081
  error:
    whitelabel: