Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/Doctor.java

@@ -371,7 +371,7 @@ public class Doctor extends IdEntity {
		}else if(2==level){
			levelName = "全科医生";
		}else if(level==3){
			levelName = "健康管理所";
			levelName = "健康管理师";
		}else{
			levelName = "";
		}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/family/FamilyMemberService.java

@@ -86,13 +86,15 @@ public class FamilyMemberService extends BaseService {
                SignFamily sign = contractService.findSignInfo(map.get("code").toString());
                boolean ssSign = false;
                boolean jtSign = false;
                map.put("statusName","未签约");
                map1.put("status","-1");
                map1.put("statusName","未签约");
                if(sign!=null){
                    if (sign.getType() == 1 ) {
                        ssSign = true;
                    } else if (sign.getType() == 2 ) {
                        jtSign = true;
                    }
                    map1.put("status",sign.getStatus());;
                    map1.put("statusName","已签约");
                    map1.put("expensesStatusName",sign.getExpensesStatusName());
                    String doctorCode = sign.getDoctor();
@@ -132,8 +134,10 @@ public class FamilyMemberService extends BaseService {
        boolean ssSign = false;
        boolean jtSign = false;
        map.put("statusName","未签约");
        map.put("status",-1);
        if (sign != null) {
            map.put("statusName","已签约");
            map.put("status",sign.getStatus());
            String doctorCode = sign.getDoctor();
            map.put("doctor",doctorCode);
            map.put("doctorName",sign.getDoctorName());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/HealthEduArticleService.java

@@ -213,7 +213,7 @@ public class HealthEduArticleService extends BaseService {
        }
        int start = page * pagesize;
        String pageInfo = " limit " + start + "," + pagesize;
        String orderBy = " order by a.czrq,a.id desc";
        String orderBy = " order by a.czrq desc";
        sql.append(where).append(orderBy).append(pageInfo);
        List<Map<String, Object>> result = jdbcTemplate.queryForList(sql.toString(), params.toArray());
        return result;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -217,7 +217,7 @@ public class PrescriptionInfoService extends BaseService {
                return pres;
            } else {
                Patient p = patientDao.findByCode(patient);
                StringBuffer sqlBuffer = new StringBuffer("SELECT p.code,LEFT(pr.create_time,19) AS createTime,p.status,p.hospital_name As hospitalName FROM wlyy_prescription p " +
                StringBuffer sqlBuffer = new StringBuffer("SELECT p.code,LEFT(p.create_time,19) AS createTime,p.status,p.hospital_name As hospitalName FROM wlyy_prescription p " +
                        "WHERE p.patient=?");
                List<Object> params = new ArrayList<>();
                params.add(patient);
@@ -486,7 +486,7 @@ public class PrescriptionInfoService extends BaseService {
                " p.photo, " +
                " pr.`status`, " +
                " pr.`code`, " +
                " pr.create_time AS createTime, " +
                " LEFT(pr.create_time,19) AS createTime, " +
                " pr.doctor " +
                " FROM " +
                " wlyy_prescription pr " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1853,7 +1853,7 @@ public class DoctorController extends BaseController {
        try {
//            Doctor doctor = doctorInfoService.findDoctorByCode(getRepUID());
            JSONObject data = doctorInfoService.getCAPastDue(getUID(),new JSONObject());
            JSONObject data = doctorInfoService.getCAPastDue("37744fa886f211e6b394fa163e424525",new JSONObject());
            return write(200, "获取信息成功！", "data", data);
        }catch (Exception e) {
            error(e);
@@ -1870,7 +1870,7 @@ public class DoctorController extends BaseController {
    public String isAuthentication(){
        try {
            //0de6a26a62dd11e69faffa163e8aee56
            JSONObject data = doctorInfoService.isAuthentication(getUID());
            JSONObject data = doctorInfoService.isAuthentication("37744fa886f211e6b394fa163e424525");
            return write(200, "获取信息成功！", "data", data);
        }catch (Exception e) {
            error(e);