名医查询bug修改

src/main/java/com/yihu/wlyy/entity/demographic/DemographicInfo.java

@@ -91,30 +91,33 @@ public class DemographicInfo implements java.io.Serializable {
	private String mothercode;//
	private String familyhtype;//
	public DemographicInfo() {
	}
	public DemographicInfo(String persontype, String name, String oldname,
                           String aliasname, String sex, Timestamp birth, Timestamp doorbirth,
                           String cardid, String nation, String edudegree, String work,
                           String party, String doorprop, String farmer, String aviso,
                           String publicize, String hortation, String checktype,
                           String single, Integer workid, String dooraddress,
                           String dooraddressinfo, String nowaddress, String nowaddressinfo,
                           String doortel, String marrytype, Timestamp marrychangedate,
                           Integer mateid, String matename, String matecardid,
                           Timestamp matebrith, Integer fatherid, String fathername,
                           Integer materid, String matername, Integer girlcount,
                           Integer boycount, Integer operatorid, String checkunit,
                           Timestamp checkdate, Integer uoperatorid, String updateunit,
                           Timestamp updatedate, Timestamp indate, Integer cancel,
                           String memo, String persontel, Timestamp arrivedate,
                           Timestamp leavedate, String conclass, String munitid, String state,
                           String health, String relaparents, String matebwork,
                           String workaddress, String mateaddtel, Integer nowchilden,
                           Timestamp schildbirth, Timestamp singlenodate, String isviolate,
                           String ismatefarmer, String workaddressid, String workname,
                           Timestamp condate, String contramemo, String matedooradd,
                           String matedooraddinfo, Timestamp fmarrydate, String unitname,
                           String addtype, String zjlxdm, String qtzjhm, String fathercode,
                           String gjdm, Timestamp dbdate, String mothercode, String familyhtype) {
						   String aliasname, String sex, Timestamp birth, Timestamp doorbirth,
						   String cardid, String nation, String edudegree, String work,
						   String party, String doorprop, String farmer, String aviso,
						   String publicize, String hortation, String checktype,
						   String single, Integer workid, String dooraddress,
						   String dooraddressinfo, String nowaddress, String nowaddressinfo,
						   String doortel, String marrytype, Timestamp marrychangedate,
						   Integer mateid, String matename, String matecardid,
						   Timestamp matebrith, Integer fatherid, String fathername,
						   Integer materid, String matername, Integer girlcount,
						   Integer boycount, Integer operatorid, String checkunit,
						   Timestamp checkdate, Integer uoperatorid, String updateunit,
						   Timestamp updatedate, Timestamp indate, Integer cancel,
						   String memo, String persontel, Timestamp arrivedate,
						   Timestamp leavedate, String conclass, String munitid, String state,
						   String health, String relaparents, String matebwork,
						   String workaddress, String mateaddtel, Integer nowchilden,
						   Timestamp schildbirth, Timestamp singlenodate, String isviolate,
						   String ismatefarmer, String workaddressid, String workname,
						   Timestamp condate, String contramemo, String matedooradd,
						   String matedooraddinfo, Timestamp fmarrydate, String unitname,
						   String addtype, String zjlxdm, String qtzjhm, String fathercode,
						   String gjdm, Timestamp dbdate, String mothercode, String familyhtype) {
		this.persontype = persontype;
		this.name = name;
		this.oldname = oldname;

src/main/java/com/yihu/wlyy/entity/demographic/ResidenceInfo.java

@@ -41,15 +41,18 @@ public class ResidenceInfo implements java.io.Serializable {
	private Integer cancelid;//出户ID对应tblreg_move或tblreg_cancel表
	private String canceltype;//出户类型（03对应死亡，04对应迁出）
	public ResidenceInfo() {
	}
	public ResidenceInfo(Integer familystateid, Integer personid,
                         String property, String relaholder, String personstate,
                         Integer operatorid, String checkunit, Timestamp checkdate,
                         String leavecau, Timestamp canceldate, String memo,
                         Integer familyinfoid, Timestamp indate, String state, String sn,
                         String team, String familyno, String doornumb, String addno,
                         String persontype, String munittype, Integer manid,
                         Timestamp startdate, Timestamp enddate, Integer jionid,
                         String jiontype, Integer cancelid, String canceltype) {
						 String property, String relaholder, String personstate,
						 Integer operatorid, String checkunit, Timestamp checkdate,
						 String leavecau, Timestamp canceldate, String memo,
						 Integer familyinfoid, Timestamp indate, String state, String sn,
						 String team, String familyno, String doornumb, String addno,
						 String persontype, String munittype, Integer manid,
						 Timestamp startdate, Timestamp enddate, Integer jionid,
						 String jiontype, Integer cancelid, String canceltype) {
		this.familystateid = familystateid;
		this.personid = personid;
		this.property = property;

src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -577,7 +577,7 @@ public class DoctorInfoService extends BaseService {
        doctor.setIsFamous(status);
    }
    public Page<Doctor> findDoctorByDept(String dept, String key, int page, int pageSize) {
    public Page<Doctor> findDoctorByDept(String dept,String hosptial, String key, int page, int pageSize) {
        if (pageSize <= 0) {
            pageSize = 10;
        }
@@ -593,7 +593,12 @@ public class DoctorInfoService extends BaseService {
        if (StringUtils.isNotEmpty(key)) {
            filters.put("name", new SearchFilter("name", SearchFilter.Operator.LIKE, key));
        }
        filters.put("dept", new SearchFilter("dept", SearchFilter.Operator.EQ, dept));
        if (StringUtils.isNotEmpty(dept)) {
            filters.put("dept", new SearchFilter("dept", SearchFilter.Operator.EQ, dept));
        }
        if (StringUtils.isNotEmpty(hosptial)) {
            filters.put("hosptial", new SearchFilter("hosptial", SearchFilter.Operator.EQ, hosptial));
        }
        Specification<Doctor> spec = DynamicSpecifications.bySearchFilter(filters.values(), Doctor.class);
        return doctorDao.findAll(spec, pageRequest);

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

@@ -281,13 +281,14 @@ public class DoctorController extends BaseController {
    @RequestMapping(value = "findDoctorByDept")
    @ResponseBody
    public String findDoctorByDept(
            String dept,
            @RequestParam(required = false)String dept,
            @RequestParam(required = false)String hosptial,
            @RequestParam(required = false) String key,
            int page,
            int pagesize) {
        try {
            JSONArray array = new JSONArray();
            Page<Doctor> list = doctorInfoService.findDoctorByDept(dept, key, page, pagesize);
            Page<Doctor> list = doctorInfoService.findDoctorByDept(dept,hosptial, key, page, pagesize);
            if (list != null) {
                for (Doctor doctor : list) {
                    JSONObject json = new JSONObject();